Use postgresql template0 as database template

db/gen/create_tables.sql

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

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'/>
@@ -9,10 +9,10 @@
     </files>
     <variables>
         <family name='risotto'>
-            <variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations'>
+            <variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations' hidden='True'>
                 <value>/srv/risotto/configurations</value>
             </variable>
-            <variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire'>
+            <variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire' hidden='True'>
                 <value>/srv/risotto/tmp</value>
             </variable>
             <variable name='risotto_default_user' type='string' description='Utilisateur par défaut'>
@@ -33,16 +33,16 @@
             <variable name='risotto_db_address' type='string' description='Adresse du serveur de base de données postgresql'>
                 <value>localhost</value>
             </variable>
-            <variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de l’API'>
+            <variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de l’API' hidden='True'>
                 <value>/srv/risotto-message/messages</value>
             </variable>
-            <variable name='risotto_cache_dir' type='filename' description='Emplacement du cache'>
+            <variable name='risotto_cache_dir' type='filename' description='Emplacement du cache' hidden='True'>
                 <value>/var/cache/risotto</value>
             </variable>
-            <variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services'>
+            <variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'>
                 <value>/srv/risotto/seed</value>
             </variable>
-            <variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory'>
+            <variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory' hidden='True'>
                 <value>/srv/factory/</value>
             </variable>
         </family>

eole.mk

@@ -88,6 +88,10 @@ sql_conf_gen_DATA_DIR		:= $(eole_DIR)/applications/gen
 sql_conf_passwords_DATA_DIR	:= $(eole_DIR)/applications/passwords
 sql_conf_updates_DATA_DIR	:= $(eole_DIR)/applications/updates/$(SOURCE)
 
+db_DIR			:= $(eole_DIR)/db
+db_gen_DATA_DIR		:= $(eole_DIR)/db/$(SOURCE)/gen
+db_updates_DATA_DIR	:= $(eole_DIR)/db/$(SOURCE)/updates
+
 # Certifs
 certs_DATA_DIR		:= $(eole_DIR)/certs
 

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.conf

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

tmpl/risotto.yml

@@ -1,10 +1,17 @@
+%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')
-template: 'postgres'
-sqlscripts: ['/usr/share/eole/db/risotto/gen/create_tables.sql']
+dbname: %%dbname
+template: 'template0'
+sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
 pwd_files:
         - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}

tmpl/tiramisu.yml

@@ -1,10 +1,17 @@
+%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
 dbname: %%getVar('risotto_tiramisu_dbname')
-template: 'postgres'
+template: 'template0'
 pwd_files:
         - {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='}