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

This commit is contained in:
Pierre-Elliott Bécue 2014-03-19 01:18:31 +01:00
parent bfd7244a43
commit 82611d64cb
10 changed files with 8 additions and 134 deletions

View file

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

View file

@ -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'):

View file

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