better lemur integration

debian/compat

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

debian/control

@@ -1,41 +0,0 @@
-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,
- risotto-user-sql,
- risotto-setting-sql,
- risotto-provider-sql,
- risotto-infra-sql,
- risotto-message,
- risotto
-Description: configuration pour l’intégration de risotto dans EOLE
- .
- Pour toute information complémentaire, veuillez vous rendre sur le
- site du projet.
-
-Package: eole-risotto-all
-Architecture: any
-Depends: ${misc:Depends},
- eole-risotto,
- python3-risotto-user,
- python3-risotto-setting,
- python3-risotto-provider,
- python3-risotto-infra,
- cadoles-risotto-seed,
- cucchiaiata,
- eole-risotto
-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

@@ -1,44 +0,0 @@
-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.install

@@ -1 +0,0 @@
-usr

debian/eole-risotto.postinst

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = configure ]; then
-    # Make sure the administrative user exists
-    if ! getent passwd risotto > /dev/null; then
-        adduser --system --home /nonexistent --no-create-home --group --gecos "User for risotto" risotto --quiet
-    fi
-fi
-
-exit 0

debian/risotto.service

@@ -1 +0,0 @@
-../risotto.service

debian/rules

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

debian/source/format

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

dicos/50_risotto.xml

@@ -2,9 +2,12 @@
 <creole>
     <files>
         <service>risotto</service>
-        <file filelist='risotto' name='/etc/risotto/risotto.conf' mkdir='True' rm='True'/>
-        <file filelist='risotto' name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>
-        <file filelist='risotto' name='/etc/eole/eole-db.d/tiramisu.yml' mkdir='True' rm='True'/>
+        <service_access service='risotto'>
+            <port>8080</port>
+        </service_access>
+        <file name='/etc/risotto/risotto.conf' owner="risotto" mkdir='True' rm='True'/>
+        <file name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>
+        <file name='/etc/eole/eole-db.d/tiramisu.yml'/>
     </files>
     <variables>
         <family name='risotto'>

posttemplate/20-directories

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 for dir in risotto_cache_dir risotto_seed_dir risotto_temp_dir risotto_configuration_dir risotto_images_dir; do
-    mkdir -p $(CreoleGet $dir)
-    chown risotto: $dir
+    dirname=$(CreoleGet $dir)
+    mkdir -p $dirname
+    chown risotto: $dirname
 done
 
 exit 0

risotto.service

@@ -1,7 +1,9 @@
 [Unit]
 Description=risotto
+After=postgresql.service
 
 [Service]
+Type=notify
 ExecStart=/usr/bin/risotto-server
 User=risotto
 Group=risotto

tmpl/risotto.conf

@@ -1,19 +1,40 @@
 CONFIGURATION_DIR=%%risotto_configuration_dir
-TMP_DIR=%%risotto_temp_dir
-DEFAULT_USER=%%risotto_default_user
-RISOTTO_DB_NAME=%%risotto_main_dbname
-RISOTTO_DB_USER=%%risotto_db_user
+TMP_DIR="%%risotto_temp_dir"
+IMAGE_PATH="%%risotto_images_dir"
+DEFAULT_USER="%%risotto_default_user"
+RISOTTO_DB_NAME="%%risotto_main_dbname"
+RISOTTO_DB_USER="%%risotto_db_user"
 RISOTTO_DB_PASSWORD=replace_me
-TIRAMISU_DB_NAME=%%risotto_tiramisu_dbname
-TIRAMISU_DB_USER=%%risotto_tiramisu_db_user
+TIRAMISU_DB_NAME="%%risotto_tiramisu_dbname"
+TIRAMISU_DB_USER="%%risotto_tiramisu_db_user"
 TIRAMISU_DB_PASSWORD=replace_me
-DB_ADDRESS=%%risotto_db_address
-MESSAGE_PATH=%%risotto_messages_dir
-CACHE_ROOT_PATH=%%risotto_cache_dir
-SRV_SEED_PATH=%%risotto_seed_dir
+RISOTTO_URL="http://%%nom_domaine_machine:8080/"
+DB_ADDRESS="%%risotto_db_address"
+MESSAGE_PATH="%%risotto_messages_dir"
+CACHE_ROOT_PATH="%%risotto_cache_dir"
+SRV_SEED_PATH="%%risotto_seed_dir"
 %set %%var = %%getVar('celeryrisotto_db_user', None)
 %if not %%is_empty(%%var)
-CELERYRISOTTO_DB_NAME=%%celeryrisotto_main_dbname
-CELERYRISOTTO_DB_USER=%%var
+CELERYRISOTTO_DB_NAME="%%celeryrisotto_main_dbname"
+CELERYRISOTTO_DB_USER="%%var"
 CELERYRISOTTO_DB_PASSWORD=replace_me
 %end if
+%set %%var = %%getVar('lemur_db_user', None)
+%if not %%is_empty(%%var)
+LEMUR_DB_NAME="%%lemur_db_name"
+LEMUR_DB_USER="%%var"
+LEMUR_DB_PASSWORD='replace_me'
+%end if
+%set %%var = %%getVar('password_admin_username', None)
+%if not %%is_empty(%%var)
+PASSWORD_ADMIN_USERNAME="%%password_admin_username"
+PASSWORD_ADMIN_EMAIL="%%password_admin_email"
+PASSWORD_ADMIN_PASSWORD="%%password_admin_password"
+PASSWORD_DEVICE_IDENTIFIER="%%password_device_identifier"
+PASSWORD_URL="https://%%nom_domaine_machine:8001/"
+PASSWORD_LENGTH=%%password_length
+%end if
+%if %%getVar('lemur_db_name', None)
+PKI_ADMIN_PASSWORD="%%lemur_admin_password"
+PKI_ADMIN_EMAIL="%%lemur_admin_email"
+%end if