From c9ff45b060834961f3bdca1fc67e628340682259 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 13 Feb 2013 08:31:38 +0100
Subject: [PATCH] =?UTF-8?q?mise=20=C3=A0=20jour=202.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documents/exercice1/{0_ircd.xml => 30_ircd.xml}   |  5 +++++
 modules_EOLE_envole/documents/exercice1/4_ircd.srv    |  4 ----
 .../{1_phpldapadmin.xml => 30_phpldapadmin.xml}       | 11 +++++++----
 .../{1_phpldapadmin.xml => 30_phpldapadmin.xml}       | 11 +++++++----
 .../documents/preparation_tronc-commun.txt            |  2 +-
 5 files changed, 20 insertions(+), 13 deletions(-)
 rename modules_EOLE_envole/documents/exercice1/{0_ircd.xml => 30_ircd.xml} (72%)
 delete mode 100644 modules_EOLE_envole/documents/exercice1/4_ircd.srv
 rename modules_EOLE_envole/documents/exercice2/{1_phpldapadmin.xml => 30_phpldapadmin.xml} (78%)
 rename modules_EOLE_envole/documents/exercice3/{1_phpldapadmin.xml => 30_phpldapadmin.xml} (86%)

diff --git a/modules_EOLE_envole/documents/exercice1/0_ircd.xml b/modules_EOLE_envole/documents/exercice1/30_ircd.xml
similarity index 72%
rename from modules_EOLE_envole/documents/exercice1/0_ircd.xml
rename to modules_EOLE_envole/documents/exercice1/30_ircd.xml
index 1c1bb8e..71bce56 100644
--- a/modules_EOLE_envole/documents/exercice1/0_ircd.xml
+++ b/modules_EOLE_envole/documents/exercice1/30_ircd.xml
@@ -2,6 +2,7 @@
 <creole>
     <files>
         <file name='/etc/sysconfig/eole/services/4_ircd.srv'/>
+	<service servicelist="ircd">ircd</service>
     </files>
     <variables>
         <family name='services'>
@@ -14,6 +15,10 @@
         <check name='valid_enum'  target='activate_ircd'>
                 <param>['oui','non']</param>
         </check>
+        <condition name='hidden_if_in' source='activate_ircd'>
+            <param>non</param>
+            <target type='servicelist'>ircd</target>
+        </condition>
     </constraints>
     <help>
     </help>
diff --git a/modules_EOLE_envole/documents/exercice1/4_ircd.srv b/modules_EOLE_envole/documents/exercice1/4_ircd.srv
deleted file mode 100644
index 5803647..0000000
--- a/modules_EOLE_envole/documents/exercice1/4_ircd.srv
+++ /dev/null
@@ -1,4 +0,0 @@
-%if %%activate_ircd == 'oui'
-ircd-irc2
-%end if
-
diff --git a/modules_EOLE_envole/documents/exercice2/1_phpldapadmin.xml b/modules_EOLE_envole/documents/exercice2/30_phpldapadmin.xml
similarity index 78%
rename from modules_EOLE_envole/documents/exercice2/1_phpldapadmin.xml
rename to modules_EOLE_envole/documents/exercice2/30_phpldapadmin.xml
index c6a2657..922d0b0 100644
--- a/modules_EOLE_envole/documents/exercice2/1_phpldapadmin.xml
+++ b/modules_EOLE_envole/documents/exercice2/30_phpldapadmin.xml
@@ -1,8 +1,11 @@
 <creole>
-    <files>
-       <file name='/etc/phpldapadmin/apache.conf'/>
-       <file name='/etc/phpldapadmin/config.php' source='phpldapadmin.php' filelist='phpldapadmin'/>
-    </files>
+    <containers>
+	<container name="web">
+            <file name='/etc/phpldapadmin/apache.conf'/>
+            <file name='/etc/phpldapadmin/config.php' source='phpldapadmin.php' filelist='phpldapadmin'/>
+            <package>phpldapadmin</package>
+	</container>
+    </containers>
     <variables>
 
         <family name='services'>
diff --git a/modules_EOLE_envole/documents/exercice3/1_phpldapadmin.xml b/modules_EOLE_envole/documents/exercice3/30_phpldapadmin.xml
similarity index 86%
rename from modules_EOLE_envole/documents/exercice3/1_phpldapadmin.xml
rename to modules_EOLE_envole/documents/exercice3/30_phpldapadmin.xml
index 65ee991..1cb183f 100644
--- a/modules_EOLE_envole/documents/exercice3/1_phpldapadmin.xml
+++ b/modules_EOLE_envole/documents/exercice3/30_phpldapadmin.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <creole>
-    <files>
-       <file name='/etc/phpldapadmin/apache.conf'/>
-       <file name='/etc/phpldapadmin/config.php' source='phpldapadmin.php' filelist='phpldapadmin'/>
-    </files>
+    <containers>
+	<container name="web">
+	    <file name='/etc/phpldapadmin/apache.conf'/>
+	    <file name='/etc/phpldapadmin/config.php' source='phpldapadmin.php' filelist='phpldapadmin'/>
+            <package>phpldapadmin</package>
+	</container>
+    </containers>
     <variables>
 
         <family name='services'>
diff --git a/modules_EOLE_envole/documents/preparation_tronc-commun.txt b/modules_EOLE_envole/documents/preparation_tronc-commun.txt
index 48571fc..9f62d53 100644
--- a/modules_EOLE_envole/documents/preparation_tronc-commun.txt
+++ b/modules_EOLE_envole/documents/preparation_tronc-commun.txt
@@ -4,5 +4,5 @@ Zephir1 à jour
 Installer Scribe1 PAS A JOUR
  Supprimer le persistance-net
 
-Pour TC2 : installer Scribe2 à jour
+Pour TC2 : installer Scribe2 à jour en mode conteneur
  Supprimer le persistance-net