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,
-  ApplicationserviceLVIP VARCHAR(255) NOT NULL,
-  ApplicationserviceLVMP VARCHAR(255) NOT NULL,
+  --ApplicationserviceLVIS VARCHAR(255) NOT NULL,
+  --ApplicationserviceLVIP VARCHAR(255) NOT NULL,
+  --ApplicationserviceLVMP VARCHAR(255) NOT NULL,
   OS JSON,
   UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
 );

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,33 @@
+Source: eole-risotto
+Section: admin
+Priority: optional
+Maintainer: Cadoles <contact@cadoles.com>
+Build-Depends: debhelper (>= 11)
+Standards-Version: 3.9.3 
+Homepage: https://forge.cadoles.com/Infra/risotto
+Vcs-Git: https://forge.cadoles.com/Infra/risotto
+Vcs-Browser: https://forge.cadoles.com/Infra/risotto
+
+Package: eole-risotto
+Architecture: any
+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
+ site du projet.
+

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-risotto.dirs

@@ -0,0 +1,5 @@
+/srv/risotto/configurations
+/srv/risotto/tmp
+/srv/risotto/seed
+/srv/factory
+/var/cache/risotto/servermodel

debian/rules

@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_installsystemd:
+	dh_installsystemd -peole-risotto --no-enable --no-start --no-stop-on-upgrade

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

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