From ae6f3dc85bdaa2cbf21bc2027a3aa570e0d72cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Wed, 26 Feb 2014 00:36:18 +0100
Subject: [PATCH] [xen => proxmox] Migration de redisdead, titanic, et
 nettoyage

---
 Base/dom0.xml                   |  9 ---------
 Cfg/etc/xen/eap/eap             | 18 ------------------
 Cfg/etc/xen/niomniom/niomniom   | 18 ------------------
 Cfg/etc/xen/redisdead/redisdead | 15 ---------------
 Cfg/etc/xen/titanic/titanic     | 13 -------------
 Metadata/groups.xml             |  4 ++--
 6 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 Cfg/etc/xen/eap/eap
 delete mode 100644 Cfg/etc/xen/niomniom/niomniom
 delete mode 100644 Cfg/etc/xen/redisdead/redisdead
 delete mode 100644 Cfg/etc/xen/titanic/titanic

diff --git a/Base/dom0.xml b/Base/dom0.xml
index a8224e1..599fcfd 100644
--- a/Base/dom0.xml
+++ b/Base/dom0.xml
@@ -3,17 +3,8 @@
     <Path name="/etc/xen/common.py"/>
     <Path name="/etc/xen/common_squeeze.py"/>
     <Path name="/etc/xen/common_wheezy.py"/>
-    <Path name="/etc/xen/niomniom"/>
-    <Path name="/etc/xen/titanic"/>
-    <Path name="/etc/xen/xmpp"/>
-    <Path name="/etc/xen/ytrap-llatsni"/>
     <Path name="/etc/xen/owl"/>
-    <Path name="/etc/xen/asterisk"/>
-    <Path name="/etc/xen/radius"/>
-    <Path name="/etc/xen/redisdead"/>
     <Path name="/etc/xen/sogo"/>
-    <Path name="/etc/xen/dhcp"/>
-    <Path name="/etc/xen/eap"/>
     <Path name="/etc/xen/routeur"/>
     <Path name="/etc/xen/puppet"/>
     <Path name="/etc/xen/cas"/>
diff --git a/Cfg/etc/xen/eap/eap b/Cfg/etc/xen/eap/eap
deleted file mode 100644
index 6944e7e..0000000
--- a/Cfg/etc/xen/eap/eap
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-import sys
-sys.stderr.write('Use proxmox !\n')
-sys.exit(1)
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "eap"
-
-disk = [ vol(name, "slash", "xvda"),
-         vol(name, "var", "xvdb"),
-         vol(name, "swap", "xvdc") ]
-
-vif = [ 
-  adm('02:65:61:70:2e:02'),
-  wifi('02:65:61:70:2e:03'),
-]
diff --git a/Cfg/etc/xen/niomniom/niomniom b/Cfg/etc/xen/niomniom/niomniom
deleted file mode 100644
index e1278e8..0000000
--- a/Cfg/etc/xen/niomniom/niomniom
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-import sys
-sys.stderr.write('Error: use proxmox !\n')
-sys.exit(1)
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "niomniom"
-
-memory = 512
-
-vif = [ pub('00:00:07:12:20:08'),
-        adm('00:00:08:12:20:08')  ]
-
-disk = [ vol("wiki", "slash", "xvda"),
-         vol("wiki", "data", "xvdb"),
-         vol("wiki", "swap", "xvdc") ]
diff --git a/Cfg/etc/xen/redisdead/redisdead b/Cfg/etc/xen/redisdead/redisdead
deleted file mode 100644
index 7b4c6f4..0000000
--- a/Cfg/etc/xen/redisdead/redisdead
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "redisdead"
-
-memory = 1024
-
-vif = [ pub('00:00:09:04:19:01'),
-        adm('00:00:09:04:19:02')  ]
-
-disk = [ vol("redisdead", "slash", "xvda"),
-         vol("redisdead", "swap", "xvdb"),
-         vol("redisdead", "var", "xvdc"),
-	 vol("redisdead", "mailman", "xvdd")]
diff --git a/Cfg/etc/xen/titanic/titanic b/Cfg/etc/xen/titanic/titanic
deleted file mode 100644
index ab70058..0000000
--- a/Cfg/etc/xen/titanic/titanic
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "titanic"
-
-disk = [ vol(name, "slash", "xvda"),
-         vol(name, "swap", "xvdb") ]
-
-vif = [ pub('aa:73:65:63:6f:75'),
-        adm('aa:73:65:63:6f:76'),
-        freebox('aa:73:65:63:6f:77'),
-      ]
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 194ba7e..90759d9 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -252,7 +252,7 @@
     <Group name="dns-secondary-no-forward"/>
     <Group name="dns-recursif"/>
     <Group name="connection-rescue"/>
-    <Group name="crans-domu-wheezy"/>
+    <Group name="crans-vm-wheezy"/>
   </Group>
 
   <Group name="eap"
@@ -409,7 +409,7 @@
   <Group name="redisdead"
      profile="true">
     <Group name="firewall"/>
-    <Group name="crans-domu-wheezy"/>
+    <Group name="crans-vm-wheezy"/>
     <Group name="mail-mx-main"/>
     <Group name="mailing-list-manager"/>
     <Group name="nginx"/> <!-- Pour mailman -->