From 2ca39a03b09857664eeaf0f7c505ff1b19753716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Tue, 16 Dec 2014 01:48:54 +0100
Subject: [PATCH] =?UTF-8?q?Omnomnom=20g=C3=A8re=20les=20homes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cfg/etc/backuppc/config/backups.py/backups.py | 5 +----
 Metadata/groups.xml                           | 7 +++++++
 Python/etc/backuppc/hosts                     | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Cfg/etc/backuppc/config/backups.py/backups.py b/Cfg/etc/backuppc/config/backups.py/backups.py
index 1556a00..cee9488 100644
--- a/Cfg/etc/backuppc/config/backups.py/backups.py
+++ b/Cfg/etc/backuppc/config/backups.py/backups.py
@@ -43,6 +43,7 @@ RsyncHosts = [
      "news",
      "niomniom",
      "o2",
+     "omnomnom",
      "odlyd",
      "owl",
      "pea",
@@ -57,7 +58,6 @@ RsyncHosts = [
      "titanic",
      "tracker",
      "vert",
-#     "vo", trop de bordel, rien de critique
      "xmpp",
      "ytrap-llatsni",
      "zamok",
@@ -153,8 +153,5 @@ DumpPreUserCmd = collections.defaultdict(str)
 
 DumpPreUserCmd["thot"] = '$sshPath -q -x -l root $host /usr/scripts/utils/pg_backups.sh'
 
-# ip du nfs
-ipnfs = '10.231.136.7'
-
 # Génération des 28 partitions de backup pour les homes.
 HomeHosts = [caractere for caractere in map(chr, range(97, 123))] + ["logs", "mail"]
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 424d9ff..f901270 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -195,6 +195,8 @@
          profile="true">
     <Group name="crans-wheezy"/>
     <Group name="nginx"/> <!-- Pour backuppc -->
+    <Group name="home-permanent"/>
+    <Group name="backup-homes"/>
   </Group>
 
   <Group name="vo"
@@ -945,6 +947,11 @@
     <!-- mirroir de l'archive debian -->
   </Group>
 
+  <Group name="backup-homes">
+    <!-- Serveur de sauvegarde -->
+    <Group name="backup-server-backend"/>
+  </Group>
+
   <Group name="backup-server">
     <!-- Serveur de sauvegarde -->
     <Group name="backup-server-backend"/>
diff --git a/Python/etc/backuppc/hosts b/Python/etc/backuppc/hosts
index a572847..e82f967 100644
--- a/Python/etc/backuppc/hosts
+++ b/Python/etc/backuppc/hosts
@@ -70,5 +70,7 @@ def backuppc_hosts(comment, hostslist):
 @#larson      1       bill                  # <--- example DHCP host entry
 @
 
-backuppc_hosts("Backups des homes", ["home-%s" % (homeName,) for homeName in HomeHosts])
-backuppc_hosts("Backups des serveurs", RsyncHosts)
+if has("backup-homes"):
+    backuppc_hosts("Backups des homes", ["home-%s" % (homeName,) for homeName in HomeHosts])
+if has("backup-server"):
+    backuppc_hosts("Backups des serveurs", RsyncHosts)