[global] Adieu squeeze, oie, lapin, gordon…

Base/needed.xml

@@ -51,12 +51,7 @@
   </Group>
 
   <Group name="domu">
-    <Group name="wheezy">
+    <Package name="linux-image-amd64"/>
-      <Package name="linux-image-amd64"/>
-    </Group>
-    <Group name="squeeze">
-      <Package name="linux-image-xen-amd64"/>
-    </Group>
   </Group>
 
 </Base>

Base/utils.xml

@@ -1,12 +1,7 @@
 <Base>
   <Group name="crans">
     <!-- Les paquets utiles pour l'utilisation de tous les jours -->
-    <Group name="squeeze">
+    <Package name="emacs23-nox"/>
-      <Package name="emacs23-nox"/>
-    </Group>
-    <Group name="wheezy">
-      <Package name="emacs23-nox"/>
-    </Group>
     <Package name="darcs"/>
     <Package name="di"/>
     <Package name="emacs-goodies-el"/>

Bundler/firewall.xml

@@ -2,7 +2,5 @@
   <Path name="/etc/init.d/firewall"/>
   <Python name="/etc/cron.d/firewall"/>
   <Action name="link-firewall"/>
-  <Group name="squeeze" negate="true">
+  <Package name="ipset" />
-    <Package name="ipset" />
-  </Group>
 </Bundle>

Bundler/home.xml

@@ -4,12 +4,7 @@
       <Python name="/etc/auto.master"/>
       <Path name="/etc/auto.home"/>
       <Path name="/etc/default/autofs"/>
-      <Group name="squeeze" negate="true">
+      <Package name="autofs"/>
-          <Package name="autofs"/>
-      </Group>
-      <Group name="squeeze">
-          <Package name="autofs5"/>
-      </Group>
       <Service name="autofs"/>
     </Group>
   </Group>

Bundler/rpc.xml

@@ -3,8 +3,4 @@
     <Package name="rpcbind"/>
     <Service name="rpcbind"/>
   </Group>
-  <Group name="squeeze">
-    <Package name="portmap"/>
-     <Service name="portmap"/>
-  </Group>
 </Bundle>

Metadata/groups.xml

@@ -116,18 +116,6 @@
     <Group name="connexion-secours-test"/>
   </Group>
 
-  <Group name="gordon"
-     profile="true">
-    <Group name="crans-squeeze"/>
-<!--
-    <Group name="firewall"/>
-    <Group name="dnssec-validation"/>
-    <Group name="dns-recursif"/>
-    <Group name="secondary-ntp-server"/>
-    <Group name="wifi-auth"/>
--->
-  </Group>
-
   <Group name="malloc" profile="true">
     <Group name="crans-wheezy"/>
     <Group name="iscsi"/>
@@ -344,30 +332,6 @@
     <Group name="ident-daemon"/>
   </Group>
 
-  <Group name="canard"
-     profile="true">
-    <Group name="mumudvb"/>
-    <Group name="crans-squeeze"/>
-  </Group>
-
-  <Group name="oie"
-     profile="true">
-    <Group name="mumudvb"/>
-    <Group name="crans-squeeze"/>
-  </Group>
-
-  <Group name="lapin"
-     profile="true">
-    <Group name="mumudvb"/>
-    <Group name="crans-squeeze"/>
-  </Group>
-
-  <Group name="dindon"
-     profile="true">
-    <Group name="mumudvb"/>
-    <Group name="crans-squeeze"/>
-  </Group>
-
   <Group name="cochon"
      profile="true">
     <Group name="mumudvb"/>
@@ -502,7 +466,6 @@
 
   <Group name="debian" category="linux-distribution"/>
   <Group name="sid" category="debian-version"/>
-  <Group name="squeeze" category="debian-version"/>
   <Group name="wheezy" category="debian-version"/>
 
   <Group name="non-free"/>
@@ -576,14 +539,6 @@
     <Group name="generate"/>
   </Group>
 
-  <Group name="crans-squeeze" public="true">
-    <!-- profile minimal pour squeeze -->
-    <Group name="crans-common"/>
-    <Group name="squeeze"/>
-    <Group name="ntp"/>
-    <Group name="console-setup"/>
-  </Group>
-
   <Group name="crans-wheezy" public="true">
     <!-- profile minimal pour wheezy -->
     <Group name="crans-common"/>
@@ -612,12 +567,6 @@
     <Bundle name="iscsi-update"/>
   </Group>
 
-
-  <Group name="crans-nfs-squeeze">
-    <Group name="crans-nfs"/>
-    <Group name="squeeze"/>
-  </Group>
-
   <Group name="crans-nfs-wheezy">
     <Group name="crans-nfs"/>
     <Group name="wheezy"/>

Packages/sources.xml

@@ -37,42 +37,4 @@
       <Arch>amd64</Arch>
     </Source>
   </Group>
-  <Group name="squeeze">
-    <Source type="apt"
-            url="http://ftp.adm.crans.org/debian"
-            version="squeeze">
-      <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="squeeze/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="squeeze-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="squeeze">
-      <Component>main</Component>
-      <Component>contrib</Component>
-      <Component>non-free</Component>
-      <Arch>i386</Arch>
-      <Arch>amd64</Arch>
-    </Source>
-  </Group>
 </Sources>

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
-"""
-

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'
+    perm = '1660'
-    if not has('squeeze'):
-        perm = '1' + perm
 
     # on vérifie le filesystem directement pour les volumes lvm
     if fs.startswith('/dev/mapper'):

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 no
-    @PrintMotd yes
-else:
-    @PrintMotd no
 @PrintLastLog yes
 @TCPKeepAlive yes
 @#UseLogin no