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

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'/>
@@ -9,10 +9,10 @@
     </files>
     <variables>
         <family name='risotto'>
-            <variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations'>
+            <variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations' hidden='True'>
                 <value>/srv/risotto/configurations</value>
             </variable>
-            <variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire'>
+            <variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire' hidden='True'>
                 <value>/srv/risotto/tmp</value>
             </variable>
             <variable name='risotto_default_user' type='string' description='Utilisateur par défaut'>
@@ -33,16 +33,16 @@
             <variable name='risotto_db_address' type='string' description='Adresse du serveur de base de données postgresql'>
                 <value>localhost</value>
             </variable>
-            <variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de l’API'>
+            <variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de l’API' hidden='True'>
                 <value>/srv/risotto-message/messages</value>
             </variable>
-            <variable name='risotto_cache_dir' type='filename' description='Emplacement du cache'>
+            <variable name='risotto_cache_dir' type='filename' description='Emplacement du cache' hidden='True'>
                 <value>/var/cache/risotto</value>
             </variable>
-            <variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services'>
+            <variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'>
                 <value>/srv/risotto/seed</value>
             </variable>
-            <variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory'>
+            <variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory' hidden='True'>
                 <value>/srv/factory/</value>
             </variable>
         </family>

eole.mk

@@ -88,6 +88,10 @@ sql_conf_gen_DATA_DIR		:= $(eole_DIR)/applications/gen
 sql_conf_passwords_DATA_DIR	:= $(eole_DIR)/applications/passwords
 sql_conf_updates_DATA_DIR	:= $(eole_DIR)/applications/updates/$(SOURCE)
 
+db_DIR			:= $(eole_DIR)/db
+db_gen_DATA_DIR		:= $(eole_DIR)/db/$(SOURCE)/gen
+db_updates_DATA_DIR	:= $(eole_DIR)/db/$(SOURCE)/updates
+
 # Certifs
 certs_DATA_DIR		:= $(eole_DIR)/certs
 

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')
-template: 'postgres'
-sqlscripts: ['/usr/share/eole/db/risotto/gen/create_tables.sql']
+dbname: %%dbname
+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='}