Delete changelog

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)
 );

debian/changelog

@@ -1,5 +0,0 @@
-eole-risotto (0.1) unstable; urgency=medium
-
-  * Création du paquet
-
- -- Cadoles <contact@cadoles.com>  Thu, 02 Apr 2020 10:43:03 +0200

debian/control

@@ -10,7 +10,22 @@ Vcs-Browser: https://forge.cadoles.com/Infra/risotto
 
 Package: eole-risotto
 Architecture: any
-Depends: ${misc:Depends}, 
+Depends: ${misc:Depends},
+ eole-db,
+ eole-postgresql,
+ python3-aiohttp,
+ risotto-user,
+ risotto-setting,
+ risotto-provider,
+ risotto-message,
+ risotto-infra,
+ cadoles-risotto-seed,
+ risotto,
+ tiramisu,
+ tiramisu-api,
+ rougail,
+ cucchiaiata,
+ tiramisu-cmdline-parser
 Description: configuration pour l’intégration de risotto dans EOLE
  .
  Pour toute information complémentaire, veuillez vous rendre sur le

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.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')
+dbname: %%dbname
-template: 'postgres'
+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='}