From f2cf26f496d9a3774bc6beacc237e3e1a1e7eb12 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Fri, 22 Feb 2013 18:59:21 +0100
Subject: [PATCH] [groups.xml] crans-squeeze-domu devient crans-domu-squeeze,
 tv.crans.org est sur sable

---
 Metadata/groups.xml | 66 ++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 9bdb58e..fa21d57 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -51,6 +51,7 @@
     <Group name="db-replicat"/>
     <Group name="dns-primary"/>
     <Group name="firmware-bnx2"/>
+    <Group name="dns-tv"/>
   </Group>
 
   <Group name="gordon"
@@ -104,18 +105,23 @@
      profile="true">
     <Group name="bcfg2-server"/>
     <Group name="non-vlan-adherent"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="nat64"
      profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
+  </Group>
+
+  <Group name="cas"
+     profile="true">
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="log"
      profile="true">
     <Group name="non-vlan-adherent"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="vert"
@@ -123,7 +129,7 @@
     <Group name="db-main"/>
 <!-- <Group name="ups-server"/> -->
     <Group name="non-vlan-adherent"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="babar"
@@ -189,12 +195,12 @@
     <Group name="dns-recursif"/>
     <Group name="connection-rescue"/>
     <Group name="failover-proxy-server"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="eap"
     profile="true">
-    <Group name="crans-squeeze-domu" />
+    <Group name="crans-domu-squeeze" />
     <Group name="db-replicat" />
     <Group name="radius-server" />
     <Group name="vlan-wifi" />
@@ -204,20 +210,19 @@
   <Group name="mdr"
      profile="true">
     <Group name="crans-squeeze"/>
-    <Group name="dns-tv"/>
     <Group name="multimedia"/>
   </Group>
 
   <Group name="irc"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="nginx" comment="Pour web-irc.crans.org" />
   </Group>
 
   <Group name="xmpp"
          profile="true">
     <Group name="ejabberd-services"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="niomniom"
@@ -227,7 +232,7 @@
 -->
     <Group name="nginx"/>
     <Group name="wiki"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="webmasters"/>
     <!-- Nécessaire pour un plugin du wiki -->
     <Group name="home-permanent"/>
@@ -235,7 +240,7 @@
 
   <Group name="owl"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="http-server"/>
     <Group name="home-permanent"/>
     <Bundle name="check_cert" />
@@ -244,7 +249,7 @@
 
   <Group name="asterisk"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Bundle name="check_cert" />
   </Group>
 
@@ -285,7 +290,7 @@
     <Group name="news-server"/>
     <Group name="http-server"/>
     <Group name="news-search"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
 
     <Bundle name="check_cert" />
     <Group name="https_cert" />
@@ -293,7 +298,7 @@
 
   <Group name="o2"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="nginx" comment="Pour l'intranet"/>
     <Bundle name="check_cert" />
     <Group name="https_cert" />
@@ -301,18 +306,18 @@
 
   <Group name="munin"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="munin-server"/>
   </Group>
 
   <Group name="install-party"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
  </Group>
 
  <Group name="radius"
     profile="true">
-   <Group name="crans-squeeze-domu"/>
+   <Group name="crans-domu-squeeze"/>
    <Group name="radius-server"/>
    <Group name="non-vlan-adherent"/>
    <Group name="db-replicat"/>
@@ -320,13 +325,13 @@
 
   <Group name="tracker"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
 <!-- <Group name="http-server"/> -->
   </Group>
 
   <Group name="pgsql"
      profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="non-vlan-adherent"/>
     <Group name="pgsql-server"/>
     <Group name="sqlgrey-localdb"/>
@@ -334,44 +339,44 @@
 
   <Group name="redisdead"
      profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="mail-mx-main"/>
     <Group name="mailing-list-manager"/>
   </Group>
 
   <Group name="listes"
      profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="mailing-list-manager"/>
   </Group>
 
   <Group name="cerbere"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="whatsupdoc"
          profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="bug-tracker"/>
   </Group>
 
   <Group name="kenobi"
         profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <Group name="sogo"
         profile="true">
     <Group name="nginx" comment="Proxy web pour SOGo"/>
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Bundle name="check_cert" />
     <Group name="https_cert" />
   </Group>
 
   <Group name="dhcp"
         profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="vlan-radin"/>
     <Group name="vlan-accueil" />
     <Group name="vlan-isolement"/>
@@ -382,7 +387,7 @@
 
   <Group name="routeur"
         profile="true">
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
     <Group name="dns-forward-only"/>
     <Group name="dnssec-validation"/>
     <Group name="vlan-radin"/>
@@ -395,7 +400,7 @@
   <Group name="puppet"
         profile="true">
     <Group name="non-vlan-adherent" />
-    <Group name="crans-squeeze-domu"/>
+    <Group name="crans-domu-squeeze"/>
   </Group>
 
   <!-- +===================+ -->
@@ -478,7 +483,7 @@
     <Group name="ntp"/>
   </Group>
 
-  <Group name="crans-squeeze-domu" public="true"
+  <Group name="crans-domu-squeeze" public="true"
      comment="profile minimal pour squeeze">
     <Group name="crans-common"/>
     <Group name="squeeze"/>
@@ -694,8 +699,7 @@
 
 
   <Group name="dns-tv"
-     comment="le serveur DNS de la ferme"
-     category="dns">
+     comment="le serveur DNS de la ferme">
     <Group name="dns-server"/>
   </Group>