Compare commits

...

8 Commits

6 changed files with 34 additions and 4 deletions

View File

@ -97,6 +97,9 @@ CREATE TABLE Applicationservice (
ApplicationserviceName VARCHAR(255) NOT NULL, ApplicationserviceName VARCHAR(255) NOT NULL,
ApplicationserviceDescription VARCHAR(255) NOT NULL, ApplicationserviceDescription VARCHAR(255) NOT NULL,
ApplicationserviceReleaseId INTEGER NOT NULL, ApplicationserviceReleaseId INTEGER NOT NULL,
ApplicationserviceLVIS VARCHAR(255) NOT NULL,
ApplicationserviceLVIP VARCHAR(255) NOT NULL,
ApplicationserviceLVMP VARCHAR(255) NOT NULL,
OS JSON, OS JSON,
UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId) UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
); );

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<creole> <creole>
<files> <files>
<!-- Je suis un commentaire --> <service>risotto</service>
<file filelist='risotto' name='/etc/risotto/risotto.conf' mkdir='True' rm='True'/> <file filelist='risotto' name='/etc/risotto/risotto.conf' mkdir='True' rm='True'/>
<file filelist='risotto' name='/etc/systemd/system/risotto.service' mkdir='True' rm='True'/> <file filelist='risotto' name='/etc/systemd/system/risotto.service' mkdir='True' rm='True'/>
<file filelist='risotto' name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/> <file filelist='risotto' name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>

View File

@ -0,0 +1,12 @@
#!/bin/bash
set -e
psql -Upostgres -c "grant all on all tables in schema public to risotto" risotto
psql -Upostgres -c "grant all on all sequences in schema public to risotto" risotto
psql -Upostgres -c "grant all on all functions in schema public to risotto" risotto
psql -Upostgres -c "grant all on all tables in schema public to tiramisu" tiramisu
psql -Upostgres -c "grant all on all sequences in schema public to tiramisu" tiramisu
psql -Upostgres -c "grant all on all functions in schema public to tiramisu" tiramisu
exit 0

View File

@ -12,3 +12,4 @@ DB_ADDRESS=%%getVar('risotto_db_address')
MESSAGE_PATH=%%getVar('risotto_messages_dir') MESSAGE_PATH=%%getVar('risotto_messages_dir')
CACHE_ROOT_PATH=%%getVar('risotto_cache_dir') CACHE_ROOT_PATH=%%getVar('risotto_cache_dir')
SRV_SEED_PATH=%%getVar('risotto_seed_dir') SRV_SEED_PATH=%%getVar('risotto_seed_dir')
PYTHONPATH="/usr/lib/python3.6/dist-packages:$PYTHONPATH"

View File

@ -1,10 +1,17 @@
%set %%dbname = %%getVar('risotto_main_dbname')
--- ---
dbuser: %%getVar('risotto_db_user') dbuser: %%getVar('risotto_db_user')
dbuser_options:
- LOGIN
privileges:
%%{dbname}.public.*: 'ALL'
%%{dbname}.public: 'ALL'
%%{dbname}: 'ALL'
dbhost: %%getVar('risotto_db_address') dbhost: %%getVar('risotto_db_address')
dbport: 5432 dbport: 5432
dbtype: postgres dbtype: postgres
dbname: %%getVar('risotto_main_dbname') dbname: %%dbname
template: 'postgres' template: 'template0'
sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql'] sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
pwd_files: pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='} - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}

View File

@ -1,10 +1,17 @@
%set %%dbname = %%getVar('risotto_tiramisu_dbname')
--- ---
dbuser: %%getVar('risotto_tiramisu_db_user') dbuser: %%getVar('risotto_tiramisu_db_user')
dbuser_options:
- LOGIN
privileges:
%%{dbname}.public.*: 'ALL'
%%{dbname}.public: 'ALL'
%%{dbname}: 'ALL'
dbhost: %%getVar('risotto_db_address') dbhost: %%getVar('risotto_db_address')
dbport: 5432 dbport: 5432
dbtype: postgres dbtype: postgres
dbname: %%getVar('risotto_tiramisu_dbname') dbname: %%getVar('risotto_tiramisu_dbname')
template: 'postgres' template: 'template0'
pwd_files: pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='} - {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='}