Infra
/
eole-risotto
5
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

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

This commit is contained in:
Emmanuel Garette 2020-10-14 18:31:11 +02:00
parent b51d36d78f d55098922b
commit 9fd1f79223
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tmpl/risotto.conf
View File

@ -1,20 +1,28 @@
CONFIGURATION_DIR=%%risotto_configuration_dir CONFIGURATION_DIR=%%risotto_configuration_dir
TMP_DIR=%%risotto_temp_dir TMP_DIR="%%risotto_temp_dir"
IMAGE_PATH=%%risotto_images_dir IMAGE_PATH="%%risotto_images_dir"
DEFAULT_USER=%%risotto_default_user DEFAULT_USER="%%risotto_default_user"
RISOTTO_DB_NAME=%%risotto_main_dbname RISOTTO_DB_NAME="%%risotto_main_dbname"
RISOTTO_DB_USER=%%risotto_db_user RISOTTO_DB_USER="%%risotto_db_user"
RISOTTO_DB_PASSWORD=replace_me RISOTTO_DB_PASSWORD=replace_me
TIRAMISU_DB_NAME=%%risotto_tiramisu_dbname TIRAMISU_DB_NAME="%%risotto_tiramisu_dbname"
TIRAMISU_DB_USER=%%risotto_tiramisu_db_user TIRAMISU_DB_USER="%%risotto_tiramisu_db_user"
TIRAMISU_DB_PASSWORD=replace_me TIRAMISU_DB_PASSWORD=replace_me
DB_ADDRESS=%%risotto_db_address DB_ADDRESS="%%risotto_db_address"
MESSAGE_PATH=%%risotto_messages_dir MESSAGE_PATH="%%risotto_messages_dir"
CACHE_ROOT_PATH=%%risotto_cache_dir CACHE_ROOT_PATH="%%risotto_cache_dir"
SRV_SEED_PATH=%%risotto_seed_dir SRV_SEED_PATH="%%risotto_seed_dir"
%set %%var = %%getVar('celeryrisotto_db_user', None) %set %%var = %%getVar('celeryrisotto_db_user', None)
%if not %%is_empty(%%var) %if not %%is_empty(%%var)
CELERYRISOTTO_DB_NAME=%%celeryrisotto_main_dbname 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('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