diff --git a/Base/needed.xml b/Base/needed.xml
index 462128e..8342a79 100644
--- a/Base/needed.xml
+++ b/Base/needed.xml
@@ -51,12 +51,7 @@
-
-
-
-
-
-
+
diff --git a/Base/utils.xml b/Base/utils.xml
index 02bb094..a903c67 100644
--- a/Base/utils.xml
+++ b/Base/utils.xml
@@ -1,12 +1,7 @@
-
-
-
-
-
-
+
diff --git a/Bundler/firewall.xml b/Bundler/firewall.xml
index c3df7f0..1cd92dd 100644
--- a/Bundler/firewall.xml
+++ b/Bundler/firewall.xml
@@ -2,7 +2,5 @@
-
-
-
+
diff --git a/Bundler/home.xml b/Bundler/home.xml
index 251c9b8..63ef215 100644
--- a/Bundler/home.xml
+++ b/Bundler/home.xml
@@ -4,12 +4,7 @@
-
-
-
-
-
-
+
diff --git a/Bundler/rpc.xml b/Bundler/rpc.xml
index 300dcbf..ac282e7 100644
--- a/Bundler/rpc.xml
+++ b/Bundler/rpc.xml
@@ -3,8 +3,4 @@
-
-
-
-
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index c51236c..31cd8c2 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -116,18 +116,6 @@
-
-
-
-
-
@@ -344,30 +332,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -502,7 +466,6 @@
-
@@ -576,14 +539,6 @@
-
-
-
-
-
-
-
-
@@ -612,12 +567,6 @@
-
-
-
-
-
-
diff --git a/Packages/sources.xml b/Packages/sources.xml
index edd4caf..aa82773 100644
--- a/Packages/sources.xml
+++ b/Packages/sources.xml
@@ -37,42 +37,4 @@
amd64
-
-
- main
- contrib
- non-free
- i386
- amd64
-
-
- main
- contrib
- non-free
- i386
- amd64
-
-
- main
- contrib
- non-free
- i386
- amd64
-
-
- main
- contrib
- non-free
- i386
- amd64
-
-
diff --git a/Python/etc/default/monit b/Python/etc/default/monit
index b6df015..01a2185 100644
--- a/Python/etc/default/monit
+++ b/Python/etc/default/monit
@@ -8,8 +8,7 @@ info["perms"] = 0644
header('Demarrage de monit')
# Pour wheezy et au-delà
-if not has('squeeze'):
- print """
+print """
# On lance monit automatiquement
START="yes"
@@ -17,13 +16,3 @@ START="yes"
MONIT_OPTS="-d 60"
"""
-else:
- print """
-
-# on lance monit au demarrage
-startup=1
-
-# intervale de verification
-CHECK_INTERVALS=60
-"""
-
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 98005b3..6542bee 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -223,7 +223,7 @@ service("openvpn-freebox",
init="openvpn",
extra=["depends on openvpn-komaz"])
-pg_version = '8.4' if has('squeeze') else '9.1'
+pg_version = '9.1'
service("pgsql-server",
name="postgresql",
init="postgresql",
@@ -354,9 +354,7 @@ for line in metadata.Probes["fstab_local"].splitlines():
comment("partition %s" % mntpoint)
# Permission attendue
- perm = '660'
- if not has('squeeze'):
- perm = '1' + perm
+ perm = '1660'
# on vérifie le filesystem directement pour les volumes lvm
if fs.startswith('/dev/mapper'):
diff --git a/Python/etc/ssh/sshd_config b/Python/etc/ssh/sshd_config
index ea19a4b..41b2d4b 100644
--- a/Python/etc/ssh/sshd_config
+++ b/Python/etc/ssh/sshd_config
@@ -65,10 +65,7 @@ header("Configuration du serveur ssh")
%X11Forwarding yesno(has("users") or has("2B"))
@X11DisplayOffset 10
-if has("squeeze"):
- @PrintMotd yes
-else:
- @PrintMotd no
+@PrintMotd no
@PrintLastLog yes
@TCPKeepAlive yes
@#UseLogin no