Merge branch 'develop' into dist/risotto/risotto-2.7.1/develop

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

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

@@ -11,7 +11,7 @@ dbhost: %%getVar('risotto_db_address')
 dbport: 5432
 dbtype: postgres
 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

@@ -11,7 +11,7 @@ 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='}