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

create directories
add debian/eole-risotto.install file
2020-09-16 15:57:37 +02:00 · 2020-09-16 15:53:58 +02:00 · 2020-09-16 14:37:09 +02:00 · 2020-09-16 14:06:59 +02:00 · 2020-09-16 12:07:06 +02:00 · 2020-09-16 11:18:32 +02:00
5 changed files with 11 additions and 17 deletions
--- a/debian/eole-risotto.dirs
+++ b/debian/eole-risotto.dirs
@ -1,5 +0,0 @@
 /srv/risotto/configurations
 /srv/risotto/tmp
 /srv/risotto/seed
 /srv/factory
 /var/cache/risotto/servermodel
--- a/debian/eole-risotto.install
+++ b/debian/eole-risotto.install
@ -0,0 +1 @@
 usr
--- a/dicos/20_partitioning_risotto.xml
+++ b/dicos/20_partitioning_risotto.xml
@ -13,19 +13,10 @@
        <auto name='calc_multi_val' target='eole_lv_names'>
            <param>root</param>
            <param>tmp</param>
            <param>var</param>
            <param>var+spool</param>
            <param>var+log</param>
            <param>home</param>
        </auto>
        <!-- Default AmonEcole* logical volumes extension: 100% /home -->
        <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'>0</param>
        </auto>
    </constraints>
    <help/>
--- a/dicos/50_risotto.xml
+++ b/dicos/50_risotto.xml
@ -34,10 +34,10 @@
                <value>localhost</value>
            </variable>
            <variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de l’API' hidden='True'>
-                <value>/srv/risotto-message/messages</value>
+                <value>/usr/share/risotto-message/messages</value>
            </variable>
            <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 name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'>
                <value>/srv/risotto/seed</value>
--- a/posttemplate/20-directories
+++ b/posttemplate/20-directories
@ -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
Author	SHA1	Message	Date
Emmanuel Garette	30836804b2	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-16 15:57:37 +02:00
Emmanuel Garette	709538e4e4	create directories	2020-09-16 15:53:58 +02:00
Emmanuel Garette	31e866bb08	add debian/eole-risotto.install file	2020-09-16 14:37:09 +02:00
Emmanuel Garette	83ac678b2b	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-09-16 14:06:59 +02:00
Emmanuel Garette	897ebdf5e3	resize partition	2020-09-16 12:07:06 +02:00
Emmanuel Garette	1ac00b5a60	srv should have all extra disk size	2020-09-16 11:18:32 +02:00
Emmanuel Garette	2c86780277	srv directory should be volatile	2020-09-16 11:17:05 +02:00
Emmanuel Garette	a2fed34dab	do not create directory in /srv	2020-09-16 11:16:29 +02:00