From d55098922b7011d7058655f6cdc37519d9a59a29 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 14 Oct 2020 18:31:05 +0200 Subject: [PATCH] add password support --- tmpl/risotto.conf | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/tmpl/risotto.conf b/tmpl/risotto.conf index 5d901b4..b37c053 100644 --- a/tmpl/risotto.conf +++ b/tmpl/risotto.conf @@ -1,20 +1,28 @@ CONFIGURATION_DIR=%%risotto_configuration_dir -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 +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 +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('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/" +%end if