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

This commit is contained in:
Emmanuel Garette 2020-09-19 10:34:09 +02:00
commit 3bd92780f5
3 changed files with 7 additions and 5 deletions

View File

@ -2,9 +2,9 @@
<creole>
<files>
<service>risotto</service>
<file filelist='risotto' name='/etc/risotto/risotto.conf' mkdir='True' rm='True'/>
<file filelist='risotto' name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>
<file filelist='risotto' name='/etc/eole/eole-db.d/tiramisu.yml' mkdir='True' rm='True'/>
<file name='/etc/risotto/risotto.conf' owner="risotto"/>
<file name='/etc/eole/eole-db.d/risotto.yml' mkdir='True' rm='True'/>
<file name='/etc/eole/eole-db.d/tiramisu.yml'/>
</files>
<variables>
<family name='risotto'>

View File

@ -1,8 +1,9 @@
#!/bin/bash
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
dirname=$(CreoleGet $dir)
mkdir -p $dirname
chown risotto: $dirname
done
exit 0

View File

@ -1,5 +1,6 @@
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