diff --git a/Bundler/rpc.xml b/Bundler/rpc.xml index ac282e7..ef90d6d 100644 --- a/Bundler/rpc.xml +++ b/Bundler/rpc.xml @@ -1,6 +1,4 @@ - - diff --git a/Metadata/groups.xml b/Metadata/groups.xml index 4257a2b..347532b 100644 --- a/Metadata/groups.xml +++ b/Metadata/groups.xml @@ -108,7 +108,6 @@ - @@ -570,6 +569,10 @@ + + + + diff --git a/Python/etc/cron.d/munin-node b/Python/etc/cron.d/munin-node index dff716f..6a31164 100644 --- a/Python/etc/cron.d/munin-node +++ b/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 # -- diff --git a/Python/etc/default/monit b/Python/etc/default/monit index 01a2185..88b30eb 100644 --- a/Python/etc/default/monit +++ b/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 diff --git a/Python/etc/hosts b/Python/etc/hosts index fac2ba2..950495c 100644 --- a/Python/etc/hosts +++ b/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 diff --git a/Python/etc/munin/munin-node.conf b/Python/etc/munin/munin-node.conf index feb4d3c..2ec8ef1 100644 --- a/Python/etc/munin/munin-node.conf +++ b/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" diff --git a/Python/etc/pam.d/common-account b/Python/etc/pam.d/common-account index 28c10ce..a0d5aa9 100644 --- a/Python/etc/pam.d/common-account +++ b/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 diff --git a/Python/etc/pam.d/common-auth b/Python/etc/pam.d/common-auth index 73396c3..72895a4 100644 --- a/Python/etc/pam.d/common-auth +++ b/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" diff --git a/Python/etc/pam.d/common-session b/Python/etc/pam.d/common-session index 808bafd..1246ebd 100644 --- a/Python/etc/pam.d/common-session +++ b/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 diff --git a/Rules/rpc.xml b/Rules/rpc.xml index 16f6241..30d7f07 100644 --- a/Rules/rpc.xml +++ b/Rules/rpc.xml @@ -1,10 +1,4 @@ - - - - - - - + diff --git a/etc/python/ldap_conn.py b/etc/python/ldap_conn.py index a9b8467..2241a83 100644 --- a/etc/python/ldap_conn.py +++ b/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")