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

dicos/50_risotto.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <creole>
     <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/systemd/system/risotto.service' mkdir='True' rm='True'/>
         <file filelist='risotto' name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>

postservice/01-fix-postgresql-permissions

@@ -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

tmpl/risotto.yml

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

tmpl/tiramisu.yml

@@ -1,5 +1,12 @@
+%set %%dbname = %%getVar('risotto_tiramisu_dbname')
 ---
 dbuser: %%getVar('risotto_tiramisu_db_user')
+dbuser_options:
+    - LOGIN
+privileges:
+    %%{dbname}.public.*: 'ALL'
+    %%{dbname}.public: 'ALL'
+    %%{dbname}: 'ALL'
 dbhost: %%getVar('risotto_db_address')
 dbport: 5432
 dbtype: postgres