diff --git a/Base/utils.xml b/Base/utils.xml
index 5b09eb6..dfe71f7 100644
--- a/Base/utils.xml
+++ b/Base/utils.xml
@@ -7,6 +7,9 @@
+
+
+
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index f978a44..524704d 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -193,7 +193,7 @@
-
+
@@ -432,6 +432,7 @@
+
@@ -497,6 +498,14 @@
+
+
+
+
+
+
+
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 218a78f..56bcfcc 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -62,14 +62,9 @@ service("backuppc-server",
pidf="backuppc/BackupPC")
# bind's pidfile has changed on squeeze
-if has("squeeze"):
- service("bind",
- init="bind9",
- pidf="named/named")
-else:
- service("bind",
- init="bind9",
- pidf="bind/run/named")
+service("bind",
+ init="bind9",
+ pidf="named/named")
service("cups",
pidf="cups/cupsd")
@@ -216,6 +211,12 @@ if hostname in ['routeur']:
@ stop program = "/etc/init.d/gunicorn stop"
@ if 5 restarts within 5 cycles then timeout
@
+ @# igmpproxy
+ @check process igmpproxy with pidfile /var/run/igmpproxy.pid
+ @ start program = "/etc/init.d/igmpproxy start"
+ @ stop program = "/etc/init.d/igmpproxy stop"
+ @ if 5 restarts within 5 cycles then timeout
+ @
if hostname in ['routeur', 'komaz']:
@# nginx
@check process nginx with pidfile /var/run/nginx.pid
@@ -265,7 +266,7 @@ for line in metadata.Probes["fstab_local"].splitlines():
comment("partition %s" % mntpoint)
# on vérifie le filesystem directement pour les volumes lvm
- if fs.startswith('/dev/mapper') and has("squeeze"):
+ if fs.startswith('/dev/mapper'):
print 'check filesystem fs%s with path %s' % (mntpoint, mntpoint)
else:
print 'check device fs%s with path %s' % (mntpoint, fs)
diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces
index c7d2bd7..3fd1ee4 100644
--- a/Python/etc/network/interfaces
+++ b/Python/etc/network/interfaces
@@ -166,8 +166,6 @@ def pub6(interface, mode = 'serveur'):
print """iface %(interface)s inet6 static
address %(ip6)s
netmask 64""" % { 'interface': interface, 'ip6': pubip6(interface) }
- if not has("squeeze"):
- print ' pre-up /sbin/modprobe ipv6'
if mode == 'serveur':
print ' gateway fe80::219:bbff:fe31:3b80'
elif mode == 'routeur':
@@ -178,8 +176,6 @@ def adm6(interface):
print """iface %(interface)s inet6 static
address %(ip6)s
netmask 64""" % { 'interface': interface, 'ip6': admip6(interface) }
- if not has("squeeze"):
- print ' pre-up /sbin/modprobe ipv6'
print
Probe_Mac = metadata.Probes["mac"].split('\n')
diff --git a/Python/etc/postfix/main.cf b/Python/etc/postfix/main.cf
index 26c2cc2..058c67e 100644
--- a/Python/etc/postfix/main.cf
+++ b/Python/etc/postfix/main.cf
@@ -192,10 +192,7 @@ if not mx:
@# TLS pour la reception
smtpd_tls_cert_file = "/etc/ssl/certs/smtp.pem"
smtpd_tls_key_file = "/etc/ssl/private/smtp.pem"
-if not has("squeeze"):
- smtpd_tls_CAfile = "/etc/ssl/certs/root.pem"
-else:
- smtpd_tls_CAfile = "/etc/ssl/certs/cacert.org.pem"
+smtpd_tls_CAfile = "/etc/ssl/certs/cacert.org.pem"
smtpd_tls_loglevel = 0
smtpd_use_tls = True
smtpd_tls_received_header = True
@@ -203,10 +200,7 @@ smtpd_tls_received_header = True
@# On utilise aussi TLS pour envoyer les mails
smtp_tls_cert_file = ""
smtp_tls_key_file = ""
-if not has("squeeze"):
- smtp_tls_CAfile = "/etc/ssl/certs/root.pem"
-else:
- smtp_tls_CAfile = "/etc/ssl/certs/cacert.org.pem"
+smtp_tls_CAfile = "/etc/ssl/certs/cacert.org.pem"
smtp_tls_loglevel = 1
smtp_use_tls = True