From b3b1e1767e13b0278e529e7032115136a8dca24a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Wed, 6 May 2015 19:55:05 +0200
Subject: [PATCH] Ajout de jessie

---
 Metadata/groups.xml                   | 15 ++++++++++-
 Packages/sources.xml                  | 39 +++++++++++++++++++++++++++
 Probes/groups                         |  5 +++-
 Python/etc/logcheck/logcheck.logfiles | 26 ------------------
 4 files changed, 57 insertions(+), 28 deletions(-)
 delete mode 100644 Python/etc/logcheck/logcheck.logfiles

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 347532b..855f301 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -338,7 +338,7 @@
 
   <Group name="asterisk"
          profile="true">
-    <Group name="crans-vm-wheezy"/>
+    <Group name="crans-vm-jessie"/>
     <Bundle name="check_cert"/>
     <Group name="asterisk-server"/>
   </Group>
@@ -483,6 +483,7 @@
   <Group name="debian" category="linux-distribution"/>
   <Group name="sid" category="debian-version"/>
   <Group name="wheezy" category="debian-version"/>
+  <Group name="jessie" category="debian-version"/>
 
   <Group name="non-free"/>
 
@@ -563,11 +564,23 @@
     <Group name="ntp"/>
   </Group>
 
+  <Group name="crans-jessie" public="true">
+    <!-- profile minimal pour jessie -->
+    <Group name="crans-common"/>
+    <Group name="jessie"/>
+    <Group name="ntp"/>
+  </Group>
+
   <Group name="crans-vm-wheezy" public="true" >
     <Group name="crans-wheezy"/>
     <Group name="domu"/>
   </Group>
 
+  <Group name="crans-vm-jessie" public="true" >
+    <Group name="crans-jessie"/>
+    <Group name="domu"/>
+  </Group>
+
   <Group name="crans-proxmox-wheezy" public="true">
     <Group name="crans-proxmox"/>
   </Group>
diff --git a/Packages/sources.xml b/Packages/sources.xml
index aa82773..4212c19 100644
--- a/Packages/sources.xml
+++ b/Packages/sources.xml
@@ -37,4 +37,43 @@
       <Arch>amd64</Arch>
     </Source>
   </Group>
+  <Group name="jessie">
+    <Source type="apt"
+            url="http://ftp.adm.crans.org/debian"
+            version="jessie">
+      <Component>main</Component>
+      <Component>contrib</Component>
+      <Component>non-free</Component>
+      <Arch>i386</Arch>
+      <Arch>amd64</Arch>
+    </Source>
+    <Source type="apt"
+            url="http://ftp.adm.crans.org/debian-security"
+            version="jessie/updates">
+      <Component>main</Component>
+      <Component>contrib</Component>
+      <Component>non-free</Component>
+      <Arch>i386</Arch>
+      <Arch>amd64</Arch>
+    </Source>
+    <Source type="apt"
+            url="http://ftp.adm.crans.org/debian"
+            version="jessie-updates">
+      <Component>main</Component>
+      <Component>contrib</Component>
+      <Component>non-free</Component>
+      <Arch>i386</Arch>
+      <Arch>amd64</Arch>
+    </Source>
+    <Source type="apt"
+            url="http://ftp.adm.crans.org/custom"
+            version="jessie">
+      <Component>main</Component>
+      <Component>contrib</Component>
+      <Component>non-free</Component>
+      <Arch>i386</Arch>
+      <Arch>amd64</Arch>
+    </Source>
+  </Group>
 </Sources>
+
diff --git a/Probes/groups b/Probes/groups
index 9c9708b..4a24835 100644
--- a/Probes/groups
+++ b/Probes/groups
@@ -25,9 +25,12 @@ elif [ -e /etc/debian_version ]; then
 			6.*)
 			OUTPUT="$OUTPUT\ngroup:squeeze"
 			;;
-			"wheezy/sid")
+			7.*)
 			OUTPUT="$OUTPUT\ngroup:wheezy"
 			;;
+			8.*)
+			OUTPUT="$OUTPUT\ngroup:jessie"
+			;;
 			"sid")
 			OUTPUT="$OUTPUT\ngroup:sid"
 			;;
diff --git a/Python/etc/logcheck/logcheck.logfiles b/Python/etc/logcheck/logcheck.logfiles
deleted file mode 100644
index db065fe..0000000
--- a/Python/etc/logcheck/logcheck.logfiles
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-info["owner"] = "root"
-info["group"] = "logcheck"
-info["perms"] = 0644
-
-header("Fichiers surveilles par logcheck")
-
-@/var/log/auth.log
-@/var/log/messages
-@/var/log/kern.log
-@/var/log/syslog
-@/var/log/user.log
-
-if has("firewall"):
-	@/var/log/firewall/iptables.err
-
-if has("mailman"):
-	@/var/log/mailman/error
-
-if has("news"):
-	@/var/log/news/news.crit
-
-if has("postfix"):
-	@/var/log/mail.log
-	@/var/log/mail.err