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

dicos/50_risotto.xml

@@ -2,6 +2,9 @@
 <creole>
     <files>
         <service>risotto</service>
+        <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'/>

risotto.service

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

tmpl/risotto.conf

@@ -8,6 +8,7 @@ RISOTTO_DB_PASSWORD=replace_me
 TIRAMISU_DB_NAME="%%risotto_tiramisu_dbname"
 TIRAMISU_DB_USER="%%risotto_tiramisu_db_user"
 TIRAMISU_DB_PASSWORD=replace_me
+RISOTTO_URL="http://%%nom_domaine_machine:8080/"
 DB_ADDRESS="%%risotto_db_address"
 MESSAGE_PATH="%%risotto_messages_dir"
 CACHE_ROOT_PATH="%%risotto_cache_dir"
@@ -18,6 +19,12 @@ 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"
@@ -25,4 +32,9 @@ 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