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

This commit is contained in:
Emmanuel Garette 2021-04-24 10:20:14 +02:00
commit 9a7b97390b
2 changed files with 4 additions and 0 deletions

View File

@ -2,6 +2,9 @@
<creole> <creole>
<files> <files>
<service>risotto</service> <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/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/risotto.yml' mkdir='True' rm='True'/>
<file name='/etc/eole/eole-db.d/tiramisu.yml'/> <file name='/etc/eole/eole-db.d/tiramisu.yml'/>

View File

@ -8,6 +8,7 @@ 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
RISOTTO_URL="http://%%nom_domaine_machine:8080/"
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"