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

This commit is contained in:
Emmanuel Garette 2021-05-22 16:38:00 +02:00
commit e79091ea8c
1 changed files with 6 additions and 0 deletions

View File

@ -19,6 +19,12 @@ CELERYRISOTTO_DB_NAME="%%celeryrisotto_main_dbname"
CELERYRISOTTO_DB_USER="%%var" CELERYRISOTTO_DB_USER="%%var"
CELERYRISOTTO_DB_PASSWORD=replace_me CELERYRISOTTO_DB_PASSWORD=replace_me
%end if %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) %set %%var = %%getVar('password_admin_username', None)
%if not %%is_empty(%%var) %if not %%is_empty(%%var)
PASSWORD_ADMIN_USERNAME="%%password_admin_username" PASSWORD_ADMIN_USERNAME="%%password_admin_username"