From e702263aec27dae2e66920f3dec99e694d7ae851 Mon Sep 17 00:00:00 2001
From: Valentin Samir <samir@crans.org>
Date: Fri, 25 Jan 2013 03:54:01 +0100
Subject: [PATCH] =?UTF-8?q?[dom,ntpd]=20Comme=20ntpd=20fonctionne=20mal=20?=
 =?UTF-8?q?dur=20les=20dom,=20on=20le=20retire=20des=20domu=20et=20des=20d?=
 =?UTF-8?q?om0=20et=20on=20cron=20ntpdate=20dessus=20pour=20voir.=20On=20a?=
 =?UTF-8?q?joutera=20un=20plugin=20munin=20pour=20surveiller=20la=20d?=
 =?UTF-8?q?=C3=A9rive.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: fede7cff549b1011af9b2f9eb8d71f81

darcs-hash:20130125025401-3a55a-18d3647aaa83b84dcd6c395b0c86ddc35ac9c43d.gz
---
 Cfg/etc/cron.d/ntpdate/info.xml |   3 +
 Cfg/etc/cron.d/ntpdate/ntpdate  |   1 +
 Metadata/groups.xml             | 102 +++++++++++++++-----------------
 3 files changed, 52 insertions(+), 54 deletions(-)
 create mode 100644 Cfg/etc/cron.d/ntpdate/info.xml
 create mode 100644 Cfg/etc/cron.d/ntpdate/ntpdate

diff --git a/Cfg/etc/cron.d/ntpdate/info.xml b/Cfg/etc/cron.d/ntpdate/info.xml
new file mode 100644
index 0000000..28fd470
--- /dev/null
+++ b/Cfg/etc/cron.d/ntpdate/info.xml
@@ -0,0 +1,3 @@
+<FileInfo>
+    <Info owner='root' group='root' perms='0644'/>
+</FileInfo>
diff --git a/Cfg/etc/cron.d/ntpdate/ntpdate b/Cfg/etc/cron.d/ntpdate/ntpdate
new file mode 100644
index 0000000..f0fc3bb
--- /dev/null
+++ b/Cfg/etc/cron.d/ntpdate/ntpdate
@@ -0,0 +1 @@
+16 * * * *      root /usr/sbin/ntpdate ntp.adm.crans.org >/dev/null
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 0ecc2d0..124f79a 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -99,19 +99,23 @@
 
   <Group name="bcfg2"
      profile="true">
-    <Group name="crans-squeeze"/>
     <Group name="bcfg2-server"/>
     <Group name="non-vlan-adherent"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
+  </Group>
+
+  <Group name="log"
+     profile="true">
+    <Group name="non-vlan-adherent"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="vert"
      profile="true">
-    <Group name="crans-squeeze"/>
     <Group name="db-main"/>
 <!-- <Group name="ups-server"/> -->
     <Group name="non-vlan-adherent"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="babar"
@@ -171,20 +175,17 @@
 
   <Group name="titanic"
       profile="true">
-    <Group name="crans-squeeze"/>
     <Group name="mail-mx-secondary"/>
     <Group name="dns-secondary-no-forward"/>
     <Group name="dns-recursif"/>
     <Group name="connection-rescue"/>
     <Group name="failover-proxy-server"/>
-    <Group name="vlan-ens"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="eap"
     profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu" />
+    <Group name="crans-squeeze-domu" />
     <Group name="db-replicat" />
     <Group name="freeradius" />
     <Group name="vlan-wifi" />
@@ -200,24 +201,21 @@
 
   <Group name="irc"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="nginx" comment="Pour web-irc.crans.org" />
   </Group>
 
   <Group name="xmpp"
          profile="true">
-    <Group name="crans-squeeze"/>
     <Group name="ejabberd-services"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="niomniom"
          profile="true">
-    <Group name="crans-squeeze"/>
     <Group name="http-server"/>
     <Group name="wiki"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="webmasters"/>
     <!-- Nécessaire pour un plugin du wiki -->
     <Group name="home-permanent"/>
@@ -225,16 +223,14 @@
 
   <Group name="owl"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="http-server"/>
     <Group name="home-permanent"/>
   </Group>
 
   <Group name="asterisk"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="canard"
@@ -271,37 +267,32 @@
 
   <Group name="news"
          profile="true">
-    <Group name="crans-squeeze"/>
     <Group name="news-server"/>
     <Group name="http-server"/>
     <Group name="news-search"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="o2"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="nginx" comment="Pour l'intranet"/>
   </Group>
 
   <Group name="munin"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="munin-server"/>
   </Group>
 
   <Group name="install-party"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
  </Group>
 
  <Group name="radius"
     profile="true">
-   <Group name="crans-squeeze"/>
-   <Group name="domu"/>
+   <Group name="crans-squeeze-domu"/>
    <Group name="radius-server"/>
    <Group name="non-vlan-adherent"/>
    <Group name="db-replicat"/>
@@ -309,15 +300,13 @@
 
   <Group name="tracker"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
 <!-- <Group name="http-server"/> -->
   </Group>
 
   <Group name="pgsql"
      profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="non-vlan-adherent"/>
     <Group name="pgsql-server"/>
     <Group name="sqlgrey-localdb"/>
@@ -325,41 +314,35 @@
 
   <Group name="redisdead"
      profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="mail-mx-main"/>
     <Group name="mailing-list-manager"/>
   </Group>
 
   <Group name="cerbere"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="whatsupdoc"
          profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="bug-tracker"/>
   </Group>
 
   <Group name="kenobi"
         profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="sogo"
         profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <Group name="dhcp"
         profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="vlan-radin"/>
     <Group name="vlan-accueil" />
     <Group name="vlan-isolement"/>
@@ -370,8 +353,7 @@
 
   <Group name="routeur"
         profile="true">
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
     <Group name="dns-recursif"/>
     <Group name="dnssec-validation"/>
     <Group name="vlan-radin"/>
@@ -384,8 +366,7 @@
   <Group name="puppet"
         profile="true">
     <Group name="non-vlan-adherent" />
-    <Group name="crans-squeeze"/>
-    <Group name="domu"/>
+    <Group name="crans-squeeze-domu"/>
   </Group>
 
   <!-- +===================+ -->
@@ -468,7 +449,16 @@
     <Group name="ntp"/>
   </Group>
 
-  <Group name="crans-wheezy" profile="true" public="true"
+  <Group name="crans-squeeze-domu" public="true"
+     comment="profile minimal pour squeeze">
+    <Group name="crans-common"/>
+    <Group name="squeeze"/>
+    <Group name="nss-ldapd"/>
+    <Group name="domu"/>
+    <Group name="ntpdate"/>
+  </Group>
+
+  <Group name="crans-wheezy" public="true"
      comment="profile minimal pour wheezy">
     <Group name="crans-common"/>
     <Group name="wheezy"/>
@@ -483,17 +473,16 @@
     <Group name="rsyslog-client"/>
     <Group name="squeeze"/>
 
-    <Group name="ntp"/>
     <Group name="mail"/>
     <Group name="apt"/>
     <Group name="secrets"/>
     <Group name="bcfg2-client"/>
     <Group name="backup-client"/>
     <Group name="xen"/>
+    <Group name="ntpdate"/>
 
     <Bundle name="apt"/>
     <Bundle name="apt-keys"/>
-    <Bundle name="ntp"/>
     <Bundle name="nagios"/>
   </Group>
 
@@ -957,12 +946,17 @@
   </Group>
 
   <Group name="ntp"
-     comment="Client NTP">
+     comment="Client NTP en daemon">
      <Bundle name="ntp"/>
   </Group>
 
+  <Group name="ntpdate"
+     comment="Client NTP">
+     <Bundle name="ntpdate"/>
+  </Group>
+
   <Group name="openntpd"
-     comment="Client OpenNTPd">
+     comment="Client OpenNTPd en daemon">
      <Bundle name="openntpd"/>
   </Group>