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

better lemur integration
2021-05-22 16:38:00 +02:00 · 2021-05-22 16:37:50 +02:00 · 2021-05-11 18:29:22 +02:00 · 2021-05-11 18:29:17 +02:00
1 changed files with 7 additions and 0 deletions
--- a/tmpl/risotto.conf
+++ b/tmpl/risotto.conf
@ -19,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"
@ -26,6 +32,7 @@ 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"
Author	SHA1	Message	Date
Emmanuel Garette	4c58765cdf	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-05-22 16:38:00 +02:00
Emmanuel Garette	a9bda337a1	better lemur integration	2021-05-22 16:37:50 +02:00
Emmanuel Garette	c2eb671dcb	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-05-11 18:29:22 +02:00
Emmanuel Garette	3a82a76c39	variable to personalise password length	2021-05-11 18:29:17 +02:00