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

This commit is contained in:
Emmanuel Garette 2020-09-16 14:06:59 +02:00
commit 83ac678b2b
3 changed files with 11 additions and 13 deletions

View File

@ -13,19 +13,10 @@
<auto name='calc_multi_val' target='eole_lv_names'> <auto name='calc_multi_val' target='eole_lv_names'>
<param>root</param> <param>root</param>
<param>tmp</param> <param>tmp</param>
<param>var</param>
<param>var+spool</param>
<param>var+log</param>
<param>home</param>
</auto> </auto>
<!-- Default AmonEcole* logical volumes extension: 100% /home -->
<auto name='calc_multi_val' target='eole_lv_standard_extends'> <auto name='calc_multi_val' target='eole_lv_standard_extends'>
<param type='number'>0</param>
<param type='number'>0</param>
<param type='number'>0</param>
<param type='number'>0</param>
<param type='number'>0</param>
<param type='number'>100</param> <param type='number'>100</param>
<param type='number'>0</param>
</auto> </auto>
</constraints> </constraints>
<help/> <help/>

View File

@ -34,13 +34,13 @@
<value>localhost</value> <value>localhost</value>
</variable> </variable>
<variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de lAPI' hidden='True'> <variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de lAPI' hidden='True'>
<value>/srv/risotto-message/messages</value> <value>/usr/share/risotto-message/messages</value>
</variable> </variable>
<variable name='risotto_cache_dir' type='filename' description='Emplacement du cache' hidden='True'> <variable name='risotto_cache_dir' type='filename' description='Emplacement du cache' hidden='True'>
<value>/var/cache/risotto</value> <value>/srv/risotto/cache/risotto</value>
</variable> </variable>
<variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'> <variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'>
<value>/srv/risotto/seed</value> <value>/usr/share/risotto/seed</value>
</variable> </variable>
<variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory' hidden='True'> <variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory' hidden='True'>
<value>/srv/factory/</value> <value>/srv/factory/</value>

7
posttemplate/20-directories Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
for dir in risotto_messages_dir risotto_cache_dir risotto_seed_dir; do
mkdir -p $(CreoleGet dir)
done
exit 0