Merge branch 'master' into dist/eole/2.7.1/master

This commit is contained in:
Benjamin Bohard 2020-04-03 15:36:08 +02:00
commit 2f4a103754

View File

@ -9,10 +9,10 @@
</files>
<variables>
<family name='risotto'>
<variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations'>
<variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations' hidden='True'>
<value>/srv/risotto/configurations</value>
</variable>
<variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire'>
<variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire' hidden='True'>
<value>/srv/risotto/tmp</value>
</variable>
<variable name='risotto_default_user' type='string' description='Utilisateur par défaut'>
@ -33,16 +33,16 @@
<variable name='risotto_db_address' type='string' description='Adresse du serveur de base de données postgresql'>
<value>localhost</value>
</variable>
<variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de lAPI'>
<variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de lAPI' hidden='True'>
<value>/srv/risotto-message/messages</value>
</variable>
<variable name='risotto_cache_dir' type='filename' description='Emplacement du cache'>
<variable name='risotto_cache_dir' type='filename' description='Emplacement du cache' hidden='True'>
<value>/var/cache/risotto</value>
</variable>
<variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services'>
<variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'>
<value>/srv/risotto/seed</value>
</variable>
<variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory'>
<variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory' hidden='True'>
<value>/srv/factory/</value>
</variable>
</family>