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

2020-04-06 17:21:54 +02:00 · 2020-04-06 17:21:54 +02:00 · 38fbfe1f61
commit 38fbfe1f61
parent c59d1a38fc 81f0635ef2
3 changed files with 11 additions and 1 deletions
--- a/postservice/01-fix-postgresql-permissions.sh
+++ b/postservice/01-fix-postgresql-permissions.sh
--- a/tmpl/risotto.yml
+++ b/tmpl/risotto.yml
@ -1,9 +1,14 @@
+%set %%dbname = %%getVar('risotto_main_dbname')
 ---
 dbuser: %%getVar('risotto_db_user')
+dbuser_options:
+    - LOGIN
+privileges:
+    %%{dbname}.public: 'ALL'
 dbhost: %%getVar('risotto_db_address')
 dbport: 5432
 dbtype: postgres
-dbname: %%getVar('risotto_main_dbname')
+dbname: %%dbname
 template: 'postgres'
 sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
 pwd_files:
--- a/tmpl/tiramisu.yml
+++ b/tmpl/tiramisu.yml
@ -1,5 +1,10 @@
+%set %%dbname = %%getVar('risotto_tiramisu_dbname')
 ---
 dbuser: %%getVar('risotto_tiramisu_db_user')
+dbuser_options:
+    - LOGIN
+privileges:
+    %%{dbname}.public: 'ALL'
 dbhost: %%getVar('risotto_db_address')
 dbport: 5432
 dbtype: postgres