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

debian/control

@@ -28,6 +28,7 @@ Package: eole-risotto-all
 Architecture: any
 Depends: ${misc:Depends},
  eole-risotto,
+ eole-risotto-setting,
  python3-risotto-user,
  python3-risotto-setting,
  python3-risotto-provider,

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