Merge branch 'master' into dist/eole/2.7.1/master

This commit is contained in:
Benjamin Bohard 2020-04-06 17:21:54 +02:00
commit 38fbfe1f61
3 changed files with 11 additions and 1 deletions

View File

@ -1,9 +1,14 @@
%set %%dbname = %%getVar('risotto_main_dbname')
--- ---
dbuser: %%getVar('risotto_db_user') dbuser: %%getVar('risotto_db_user')
dbuser_options:
- LOGIN
privileges:
%%{dbname}.public: '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: 'postgres'
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:

View File

@ -1,5 +1,10 @@
%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'
dbhost: %%getVar('risotto_db_address') dbhost: %%getVar('risotto_db_address')
dbport: 5432 dbport: 5432
dbtype: postgres dbtype: postgres