From 7601daa341b06bc9a13613a06f5d7c9208964c7c Mon Sep 17 00:00:00 2001
From: Antoine Durand-Gasselin <adg@crans.org>
Date: Fri, 13 Mar 2009 09:15:05 +0100
Subject: [PATCH] [bcfg2] ajout de owl.crans.org et asterisk.crans.org

darcs-hash:20090313081505-bd074-b43606c63f11cb48ddeae987f6a122e7dad02477.gz
---
 Base/dom0.xml                 | 15 +++++++++++++++
 Cfg/etc/xen/asterisk/asterisk | 14 ++++++++++++++
 Cfg/etc/xen/owl/owl           | 14 ++++++++++++++
 Metadata/clients.xml          |  2 ++
 Metadata/groups.xml           | 14 +++++++++++++-
 Python/etc/fstab              |  1 +
 6 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 Base/dom0.xml
 create mode 100644 Cfg/etc/xen/asterisk/asterisk
 create mode 100644 Cfg/etc/xen/owl/owl

diff --git a/Base/dom0.xml b/Base/dom0.xml
new file mode 100644
index 0000000..817eee0
--- /dev/null
+++ b/Base/dom0.xml
@@ -0,0 +1,15 @@
+<Base>
+  <Group name="dom0">
+    <ConfigFile name="/etc/xen/common.py"/>
+    <ConfigFile name="/etc/xen/irc"/>
+    <ConfigFile name="/etc/xen/munin"/>
+    <ConfigFile name="/etc/xen/news"/>
+    <ConfigFile name="/etc/xen/niomniom"/>
+    <ConfigFile name="/etc/xen/o2"/>
+    <ConfigFile name="/etc/xen/titanic"/>
+    <ConfigFile name="/etc/xen/xmpp"/>
+    <ConfigFile name="/etc/xen/ytrap-llatsni"/>
+    <ConfigFile name="/etc/xen/owl"/>
+    <ConfigFile name="/etc/xen/asterisk"/>
+  </Group>
+</Base>
diff --git a/Cfg/etc/xen/asterisk/asterisk b/Cfg/etc/xen/asterisk/asterisk
new file mode 100644
index 0000000..3be4d8b
--- /dev/null
+++ b/Cfg/etc/xen/asterisk/asterisk
@@ -0,0 +1,14 @@
+# -*- coding: utf-8; mode: python -*-
+
+execfile("/etc/xen/common.py")
+
+name = "asterisk"
+
+memory = 512
+
+vif = [ pub('00:00:13:03:09:0c'),
+        adm('00:00:13:03:09:0d')  ]
+
+disk = [ vol("asterisk", "slash", "hda"),
+         vol("asterisk", "swap", "hdb") ]
+
diff --git a/Cfg/etc/xen/owl/owl b/Cfg/etc/xen/owl/owl
new file mode 100644
index 0000000..da317b7
--- /dev/null
+++ b/Cfg/etc/xen/owl/owl
@@ -0,0 +1,14 @@
+# -*- coding: utf-8; mode: python -*-
+
+execfile("/etc/xen/common.py")
+
+name = "owl"
+
+memory = 512
+
+vif = [ pub('00:00:13:03:09:0a'),
+        adm('00:00:13:03:09:0b')  ]
+
+disk = [ vol("owl", "slash", "hda"),
+         vol("owl", "swap", "hdb") ]
+
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index bad0d85..ef3a935 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -26,6 +26,8 @@
   <Client name="niomniom.adm.crans.org" profile="niomniom" pingable="Y"/>
   <Client name="ytrap-llatsni.adm.crans.org" profile="install-party" pingable="Y"/>
   <Client name="radius.adm.crans.org" profile="radius" pingable="Y"/>
+  <Client name="owl.adm.crans.org" profile="owl" pingable="Y"/>
+  <Client name="asterisk.adm.crans.org" profile="asterisk" pingable="Y"/>
 
   <!-- La ferme -->
   <Client name="canard.adm.crans.org" profile="canard" pingable="Y"/>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 2a33499..344bd09 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -162,11 +162,23 @@
     <Group name="http-server"/>
     <Group name="domu"/>
     <Group name="webmasters"/>
-
     <!-- Nécessaire pour un plugin du wiki -->
     <Group name="home-permanent"/>
   </Group>
 
+  <Group name="owl"
+         profile="true">
+    <Group name="crans-lenny"/>
+    <Group name="domu"/>
+    <Group name="http-server"/>
+  </Group>
+
+  <Group name="asterisk"
+         profile="true">
+    <Group name="crans-lenny"/>
+    <Group name="domu"/>
+  </Group>
+
   <Group name="canard"
 	 profile="true">
     <Group name="crans-etch"/>
diff --git a/Python/etc/fstab b/Python/etc/fstab
index bebb6ea..bde6cf1 100644
--- a/Python/etc/fstab
+++ b/Python/etc/fstab
@@ -10,6 +10,7 @@ def mnt(fs, mntpoint, type, options=[], dump=0, pass_=0):
 
 @# Les définitions classiques
 mnt("proc", "/proc", "proc")
+mnt("shm", "/dev/shm", "tmpfs")
 
 @# Les définitions locales
 print metadata.probes["fstab_local"]