package number in changelog

Merge branch 'master' into dist/eole/2.7.1/master
Use postgresql template0 as database template
2020-07-22 16:48:04 +02:00 · 2020-07-03 09:22:18 +02:00 · 2020-06-30 10:39:48 +02:00 · 2020-04-09 16:06:55 +02:00 · 2020-04-09 10:13:27 +02:00 · 2020-04-09 09:09:26 +02:00
5 changed files with 7 additions and 3 deletions
--- a/db/gen/create_tables.sql
+++ b/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)
 );
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-eole-risotto (0.1) unstable; urgency=medium
+eole-risotto (0.1-1) unstable; urgency=medium

  * Création du paquet

--- a/tmpl/risotto.conf
+++ b/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"
--- a/tmpl/risotto.yml
+++ b/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='}
--- a/tmpl/tiramisu.yml
+++ b/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='}
Author	SHA1	Message	Date
Benjamin Bohard	a5a5ca875b	package number in changelog	2020-07-22 16:48:04 +02:00
Benjamin Bohard	73ec33377c	Merge branch 'master' into dist/eole/2.7.1/master	2020-07-03 09:22:18 +02:00
Benjamin Bohard	7cc19606c1	Use postgresql template0 as database template	2020-06-30 10:39:48 +02:00
Benjamin Bohard	ad7b3dcfd8	Upgrade specification of applicationservice	2020-04-09 16:06:55 +02:00
Benjamin Bohard	34bd8c648c	Merge branch 'master' into dist/eole/2.7.1/master	2020-04-09 10:13:27 +02:00
Emmanuel Garette	dc9454bc75	add pythonpath to use good tiramisu's version	2020-04-09 09:09:26 +02:00