From 7f4c72d64e371a64aeb003f5d6ddf927b2c1e8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Tue, 10 Sep 2013 11:20:30 +0200
Subject: [PATCH] [ytrap-llatsni] Oubli des Rules, et wtf @profile

---
 Bundler/dnsmasq.xml         | 1 +
 Bundler/isc-dhcp-server.xml | 2 +-
 Bundler/pxe.xml             | 1 +
 Metadata/clients.xml        | 2 +-
 Metadata/groups.xml         | 6 +-----
 Rules/dnsmasq.xml           | 4 ++++
 Rules/pxe.xml               | 4 ++++
 7 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 Rules/dnsmasq.xml
 create mode 100644 Rules/pxe.xml

diff --git a/Bundler/dnsmasq.xml b/Bundler/dnsmasq.xml
index 6b6d396..fb7a517 100644
--- a/Bundler/dnsmasq.xml
+++ b/Bundler/dnsmasq.xml
@@ -3,4 +3,5 @@
     <Path name="/etc/dnsmasq.conf"/>
 
     <Package name="dnsmasq"/>
+    <Service name="dnsmasq"/>
 </Bundle>
diff --git a/Bundler/isc-dhcp-server.xml b/Bundler/isc-dhcp-server.xml
index 74eb6b0..f477624 100644
--- a/Bundler/isc-dhcp-server.xml
+++ b/Bundler/isc-dhcp-server.xml
@@ -2,7 +2,7 @@
     <Package name="isc-dhcp-server"/>
     <Service name="isc-dhcp-server"/>
     <Path type="directory" name="/etc/dhcp3/generated"/>
-    <Path type="symlink" name="/etc/dhcp"/>
+    <Path type="symlink" name="/etc/dhcp" to="/etc/dhcp3"/>
     <Python name="/etc/dhcp3/dhcpd.conf"/>
     <Python name="/etc/dhcp3/omapi.conf"/>
     <Python name="/etc/dhcp3/dhcp-failover.conf"/>
diff --git a/Bundler/pxe.xml b/Bundler/pxe.xml
index 215abed..31d617c 100644
--- a/Bundler/pxe.xml
+++ b/Bundler/pxe.xml
@@ -1,5 +1,6 @@
 <Bundle name="pxe" version="2.0">
     <Package name="tftpd-hpa"/>
+    <Service name="tftpd-hpa"/>
 
     <Path name="/etc/default/tftpd-hpa"/>
     <Group name="clonepxe" negate="true">
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index f6faef1..3c7b5d8 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -28,7 +28,7 @@
   <Client name="o2.adm.crans.org" profile="o2" pingable="Y" pingtime="1342471851.03"/>
   <Client name="news.adm.crans.org" profile="news" pingable="Y" pingtime="1342471851.02"/>
   <Client name="niomniom.adm.crans.org" profile="niomniom" pingable="Y" pingtime="1342471851.01"/>
-  <Client name="ytrap-llatsni.adm.crans.org" profile="install-party" pingable="Y" pingtime="1342471851.01"/>
+  <Client name="ytrap-llatsni.adm.crans.org" profile="ytrap-llatsni" pingable="Y" pingtime="1342471851.01"/>
   <Client name="radius.adm.crans.org" profile="radius" pingable="Y" pingtime="1342471851.0"/>
   <Client name="owl.adm.crans.org" profile="owl" pingable="Y" pingtime="1342471850.99"/>
   <Client name="asterisk.adm.crans.org" profile="asterisk" pingable="Y" pingtime="1342471850.99"/>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 1c9446d..4498cfb 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -324,6 +324,7 @@
 
   <Group name="ytrap-llatsni"
      profile="true">
+    <Group name="crans-domu-wheezy"/>
     <Group name="vlan-evenementiel"/>
 
     <Group name="dhcp-server-primary"/>
@@ -357,11 +358,6 @@
     <Group name="https_cert" />
   </Group>
 
-  <Group name="install-party"
-         profile="true">
-    <Group name="crans-domu-wheezy"/>
- </Group>
-
  <Group name="radius"
     profile="true">
    <Group name="crans-domu-wheezy"/>
diff --git a/Rules/dnsmasq.xml b/Rules/dnsmasq.xml
new file mode 100644
index 0000000..ef078e4
--- /dev/null
+++ b/Rules/dnsmasq.xml
@@ -0,0 +1,4 @@
+<!-- Règles pour dnsmasq //-->
+<Rules priority="1">
+  <Service type="deb" name="dnsmasq" status="on"/>
+</Rules>
diff --git a/Rules/pxe.xml b/Rules/pxe.xml
new file mode 100644
index 0000000..a5df6f6
--- /dev/null
+++ b/Rules/pxe.xml
@@ -0,0 +1,4 @@
+<!-- Rules pxe //-->
+<Rules priority="1">
+  <Service type="deb" name="tftpd-hpa" status="on"/>
+</Rules>