diff --git a/dicos/50_risotto.xml b/dicos/50_risotto.xml
index 388ebc6..f0bc7d1 100644
--- a/dicos/50_risotto.xml
+++ b/dicos/50_risotto.xml
@@ -3,7 +3,6 @@
risotto
-
@@ -37,30 +36,14 @@
/usr/share/risotto-message/messages
- /srv/risotto/cache/risotto
+ /srv/risotto/cache
/srv/risotto/seed
-
- /srv/factory/
+
+ /srv/risotto/images
-
-
-
- Aide pour la variable risotto_configuration_dir
- Aide pour la variable risotto_temp_dir
- Aide pour la variable risotto_default_user
- Aide pour la variable risotto_main_dbname
- Aide pour la variable risotto_tiramisu_dbname
- Aide pour la variable risotto_db_user
- Aide pour la variable risotto_tiramisu_db_user
- Aide pour la variable risotto_db_address
- Aide pour la variable risotto_messages_dir
- Aide pour la variable risotto_cache_dir
- Aide pour la variable risotto_seed_dir
- Aide pour la variable risotto_factory_configuration_dir
-
diff --git a/posttemplate/20-directories b/posttemplate/20-directories
index 481d741..c207962 100755
--- a/posttemplate/20-directories
+++ b/posttemplate/20-directories
@@ -1,7 +1,8 @@
#!/bin/bash
-for dir in risotto_messages_dir risotto_cache_dir risotto_seed_dir; do
+for dir in risotto_cache_dir risotto_seed_dir risotto_temp_dir risotto_configuration_dir risotto_images_dir; do
mkdir -p $(CreoleGet $dir)
+ chown risotto: $dir
done
exit 0
diff --git a/tmpl/risotto.service b/risotto.service
similarity index 72%
rename from tmpl/risotto.service
rename to risotto.service
index 8efa16f..4d4860a 100644
--- a/tmpl/risotto.service
+++ b/risotto.service
@@ -2,8 +2,9 @@
Description=risotto
[Service]
-EnvironmentFile=/etc/risotto/risotto.conf
ExecStart=/usr/bin/risotto-server
+User=risotto
+Group=risotto
[Install]
WantedBy=multi-user.target
diff --git a/tmpl/risotto.conf b/tmpl/risotto.conf
index 1a6b230..88b995d 100644
--- a/tmpl/risotto.conf
+++ b/tmpl/risotto.conf
@@ -1,15 +1,19 @@
-CONFIGURATION_DIR=%%getVar('risotto_configuration_dir')
-PROVIDER_FACTORY_CONFIG_DIR=%%getVar('risotto_factory_configuration_dir')
-TMP_DIR=%%getVar('risotto_temp_dir')
-DEFAULT_USER=%%getVar('risotto_default_user')
-RISOTTO_DB_NAME=%%getVar('risotto_main_dbname')
-RISOTTO_DB_USER=%%getVar('risotto_db_user')
+CONFIGURATION_DIR=%%risotto_configuration_dir
+TMP_DIR=%%risotto_temp_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=%%getVar('risotto_tiramisu_dbname')
-TIRAMISU_DB_USER=%%getVar('risotto_tiramisu_db_user')
+TIRAMISU_DB_NAME=%%risotto_tiramisu_dbname
+TIRAMISU_DB_USER=%%risotto_tiramisu_db_user
TIRAMISU_DB_PASSWORD=replace_me
-DB_ADDRESS=%%getVar('risotto_db_address')
-MESSAGE_PATH=%%getVar('risotto_messages_dir')
-CACHE_ROOT_PATH=%%getVar('risotto_cache_dir')
-SRV_SEED_PATH=%%getVar('risotto_seed_dir')
-PYTHONPATH="/usr/lib/python3.6/dist-packages:$PYTHONPATH"
+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_PASSWORD=replace_me
+%end if
diff --git a/tmpl/risotto.yml b/tmpl/risotto.yml
index c822522..c2f804d 100644
--- a/tmpl/risotto.yml
+++ b/tmpl/risotto.yml
@@ -1,14 +1,14 @@
%from os import listdir
-%set %%dbname = %%getVar('risotto_main_dbname')
+%set %%dbname = %%risotto_main_dbname
---
-dbuser: %%getVar('risotto_db_user')
+dbuser: %%risotto_db_user
dbuser_options:
- LOGIN
privileges:
%%{dbname}.public.*: 'ALL'
%%{dbname}.public: 'ALL'
%%{dbname}: 'ALL'
-dbhost: %%getVar('risotto_db_address')
+dbhost: %%risotto_db_address
dbport: 5432
dbtype: postgres
dbname: %%dbname
diff --git a/tmpl/tiramisu.yml b/tmpl/tiramisu.yml
index de6668f..f9c5221 100644
--- a/tmpl/tiramisu.yml
+++ b/tmpl/tiramisu.yml
@@ -1,16 +1,16 @@
-%set %%dbname = %%getVar('risotto_tiramisu_dbname')
+%set %%dbname = %%risotto_tiramisu_dbname
---
-dbuser: %%getVar('risotto_tiramisu_db_user')
+dbuser: %%risotto_tiramisu_db_user
dbuser_options:
- LOGIN
privileges:
%%{dbname}.public.*: 'ALL'
%%{dbname}.public: 'ALL'
%%{dbname}: 'ALL'
-dbhost: %%getVar('risotto_db_address')
+dbhost: %%risotto_db_address
dbport: 5432
dbtype: postgres
-dbname: %%getVar('risotto_tiramisu_dbname')
+dbname: %%risotto_tiramisu_dbname
template: 'template0'
pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'TIRAMISU_DB_PASSWORD='}