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

open port 8080 (for terraform)
2021-04-24 10:20:14 +02:00 · 2021-04-24 10:20:03 +02:00
2 changed files with 4 additions and 0 deletions
--- a/dicos/50_risotto.xml
+++ b/dicos/50_risotto.xml
@ -2,6 +2,9 @@
 <creole>
    <files>
        <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/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>
        <file name='/etc/eole/eole-db.d/tiramisu.yml'/>
--- a/tmpl/risotto.conf
+++ b/tmpl/risotto.conf
@ -8,6 +8,7 @@ RISOTTO_DB_PASSWORD=replace_me
 TIRAMISU_DB_NAME="%%risotto_tiramisu_dbname"
 TIRAMISU_DB_USER="%%risotto_tiramisu_db_user"
 TIRAMISU_DB_PASSWORD=replace_me
+RISOTTO_URL="http://%%nom_domaine_machine:8080/"
 DB_ADDRESS="%%risotto_db_address"
 MESSAGE_PATH="%%risotto_messages_dir"
 CACHE_ROOT_PATH="%%risotto_cache_dir"
Author	SHA1	Message	Date
Emmanuel Garette	9a7b97390b	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-04-24 10:20:14 +02:00
Emmanuel Garette	b83e20ce22	open port 8080 (for terraform)	2021-04-24 10:20:03 +02:00