retire les switchs if has('wheezy')

Bundler/rpc.xml

@@ -1,6 +1,4 @@
 <Bundle name="rpc">
-  <Group name="wheezy">
     <Package name="rpcbind"/>
     <Service name="rpcbind"/>
-  </Group>
 </Bundle>

Metadata/groups.xml

@@ -108,7 +108,6 @@
   <Group name="kdell" profile="true">
     <Group name="firmware-bnx2"/>
     <Group name="crans-proxmox-wheezy"/>
-    <Group name="iscsi"/>
   </Group>
 
   <Group name="ft" profile="true">
@@ -570,6 +569,10 @@
   </Group>
 
   <Group name="crans-proxmox-wheezy" public="true">
+    <Group name="crans-proxmox"/>
+  </Group>
+
+  <Group name="crans-proxmox" public="true">
       <!-- Groupe pour les hôtes proxmox -->
     <Group name="crans-wheezy"/>
     <Group name="iscsi"/>

Python/etc/cron.d/munin-node

@@ -15,8 +15,7 @@ MAILTO=root
 
 """
 
-if has("wheezy"):
-    print """# J'ai trouve ce workaround sur :
+print """# J'ai trouve ce workaround sur :
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687912
 # le bugreport pretend que la derniere version de munin fix le probleme, mais non
 # -- 

Python/etc/default/monit

@@ -7,7 +7,6 @@ info["perms"] = 0644
 
 header('Demarrage de monit')
 
-# Pour wheezy et au-delà
 print """
 
 # On lance monit automatiquement

Python/etc/hosts

@@ -20,7 +20,7 @@ if(has("odlyd")):
 	print "138.231.136.9 sable.crans.org sable"
 	print "138.231.136.98 charybde.crans.org charybde"
 
-if(has("dom0")):
+if(has("iscsi")):
 	print "10.231.136.36 nols.adm.crans.org nols.adm nols"
 
 @# The following lines are desirable for IPv6 capable hosts

Python/etc/munin/munin-node.conf

@@ -3,8 +3,8 @@
 import sys
 
 include("ip")
-if '/usr/scripts/' not in sys.path:
-    sys.path.append('/usr/scripts/')
+if '/usr/scripts' not in sys.path:
+    sys.path.append('/usr/scripts')
 from gestion import config
 
 info["owner"] = "root"

Python/etc/pam.d/common-account

@@ -19,11 +19,7 @@ pam-auth-update(8) for details.
 
 """)
 
-if not has('wheezy'):
-    print "account sufficient %s" %pam_module
-    print "account required pam_unix.so use_first_pass"
-
-else:
+if True: # TODO retirer les @
     @# here are the per-package modules (the "Primary" block)
     @account        [success=1 new_authtok_reqd=done default=ignore]        pam_unix.so use_first_pass
     @# here's the fallback if no module succeeds

Python/etc/pam.d/common-auth

@@ -18,11 +18,7 @@ pam-auth-update to manage selection of other modules.  See
 pam-auth-update(8) for details.
 """)
 
-if not has('wheezy'):
-    print "auth sufficient %s" % pam_module
-    print "auth required   pam_unix.so nullok_secure use_first_pass"
-
-else:
+if True: # TODO get rid of @
     @# here are the per-package modules (the "Primary" block)
     if has('ldap'):
         print "auth   [success=2 default=ignore]      pam_unix.so nullok_secure"

Python/etc/pam.d/common-session

@@ -17,12 +17,7 @@ pam-auth-update to manage selection of other modules.  See
 pam-auth-update(8) for details.
 """)
 
-if not has('wheezy'):
-    print "session sufficient %s" % pam_module
-    print "session required   pam_unix.so"
-    print "session required   pam_mkhomedir.so"
-
-else:
+if True: # TODO get rid of @
     @# here are the per-package modules (the "Primary" block)
     @session        [default=1]                     pam_permit.so
     @# here's the fallback if no module succeeds

Rules/rpc.xml

@@ -1,10 +1,4 @@
 <!-- Règles pour rpc //-->
 <Rules priority="1">
-  <Group name="squeeze">
-      <Service type="deb" name="portmap" status="on"/>
-  </Group>
-
-  <Group name="wheezy">
   <Service type="deb" name="rpcbind" status="on"/>
-  </Group>
 </Rules>

etc/python/ldap_conn.py

@@ -3,8 +3,8 @@
 # Connexion à la base ldap (pour requêtes diverses)
 
 import sys
-sys.path.append('/usr/scripts/')
+if '/usr/scripts' not in sys.path:
+    sys.path.append('/usr/scripts')
 import lc_ldap.shortcuts
-sys.path.pop()
 
 ldap_conn=lc_ldap.shortcuts.lc_ldap_readonly(user="bcfg2")