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

Manage service
2020-04-07 15:11:30 +02:00 · 2020-04-07 15:11:09 +02:00 · 2020-04-07 14:34:48 +02:00 · 2020-04-07 14:34:37 +02:00
3 changed files with 5 additions and 1 deletions
--- a/dicos/50_risotto.xml
+++ b/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'/>
--- a/tmpl/risotto.yml
+++ b/tmpl/risotto.yml
@ -4,7 +4,9 @@ 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
--- a/tmpl/tiramisu.yml
+++ b/tmpl/tiramisu.yml
@ -4,7 +4,9 @@ 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
Author	SHA1	Message	Date
Benjamin Bohard	20fcc89840	Merge branch 'master' into dist/eole/2.7.1/master	2020-04-07 15:11:30 +02:00
Benjamin Bohard	014dc29e8a	Manage service	2020-04-07 15:11:09 +02:00
Benjamin Bohard	3d17ddf1f8	Merge branch 'master' into dist/eole/2.7.1/master	2020-04-07 14:34:48 +02:00
Benjamin Bohard	e96e4e81c8	Explicit privileges for databases	2020-04-07 14:34:37 +02:00