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

db/gen/create_tables.sql

@@ -61,7 +61,7 @@ CREATE TABLE Server (
 CREATE TABLE Source (
   SourceId SERIAL PRIMARY KEY,
   SourceName VARCHAR(255) NOT NULL UNIQUE,
-  SourceURL TEXT
+  SourceDirectory TEXT
 );
 
 -- Release
@@ -97,9 +97,9 @@ CREATE TABLE Applicationservice (
   ApplicationserviceName VARCHAR(255) NOT NULL,
   ApplicationserviceDescription VARCHAR(255) NOT NULL,
   ApplicationserviceReleaseId INTEGER NOT NULL,
-  ApplicationserviceLVIS VARCHAR(255) NOT NULL,
+  --ApplicationserviceLVIS VARCHAR(255) NOT NULL,
-  ApplicationserviceLVIP VARCHAR(255) NOT NULL,
+  --ApplicationserviceLVIP VARCHAR(255) NOT NULL,
-  ApplicationserviceLVMP VARCHAR(255) NOT NULL,
+  --ApplicationserviceLVMP VARCHAR(255) NOT NULL,
   OS JSON,
   UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
 );

posttemplate/10-fix-postgresql-permissions

@@ -2,6 +2,8 @@
 
 set -e
 
+systemctl start postgresql.service
+
 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
@@ -9,4 +11,6 @@ psql -Upostgres -c "grant all on all tables in schema public to tiramisu" tirami
 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
 
+systemctl stop postgresql.service
+
 exit 0