From a5fe3a1778cb84aac97f05da008957ca900745a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Thu, 17 Jan 2013 23:30:22 +0100
Subject: [PATCH] =?UTF-8?q?Admonly=20remplac=C3=A9=20par=20nonadherent,=20?=
 =?UTF-8?q?et=20ajout=20de=20vlan-wif=20par=20endroits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ignore-this: 3bf49fca4dca8c61aa0eb0dc0128e65a
Une machine qui n'est pas sur vlan adhérent peut être sur d'autres vlans, on remplace adm-only par non-vlan-adherent.

On ajoute aussi des trucs pour les machines sur le vlan-wifi.

darcs-hash:20130117223022-afe24-5191157757322bc0718b6b564f4c7ceea86438e5.gz
---
 Metadata/groups.xml          | 21 +++++++++++----------
 Python/etc/hosts             |  7 +++++--
 Python/etc/monit/services    |  3 ++-
 Python/etc/postfix/canonical |  2 +-
 Python/etc/postfix/main.cf   |  6 +++---
 etc/python/common.py         |  5 ++++-
 etc/python/ip.py             |  2 +-
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index bbfd94c..f0e3aa5 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -30,7 +30,7 @@
   <Group name="daath"
      profile="true">
     <Group name="crans-nfs-squeeze"/>
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
   </Group>
 
   <Group name="sable"
@@ -73,6 +73,7 @@
     <Group name="autostatus"/>
     <Group name="sniffer"/>
     <Group name="munin-server"/>
+    <Group name="vlan-wifi" />
   </Group>
 
   <Group name="zamok"
@@ -94,7 +95,7 @@
      profile="true">
     <Group name="crans-squeeze"/>
     <Group name="bcfg2-server"/>
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
     <Group name="domu"/>
   </Group>
 
@@ -103,7 +104,7 @@
     <Group name="crans-squeeze"/>
     <Group name="db-main"/>
 <!-- <Group name="ups-server"/> -->
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
     <Group name="domu"/>
   </Group>
 
@@ -113,7 +114,7 @@
     <Group name="db-replicat"/>
     <Group name="backup-server"/>
     <Group name="backup-ftp-server"/>
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
   </Group>
 
   <Group name="vo"
@@ -143,14 +144,14 @@
      profile="true">
     <Group name="crans-dom0-squeeze"/>
     <Group name="firmware-bnx2"/>
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
   </Group>
 
   <Group name="fz"
      profile="true">
     <Group name="crans-dom0-squeeze"/>
     <Group name="firmware-bnx2"/>
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
   </Group>
 
   <Group name="thot"
@@ -282,7 +283,7 @@
    <Group name="crans-squeeze"/>
    <Group name="domu"/>
    <Group name="radius-server"/>
-   <Group name="adm-only"/>
+   <Group name="non-vlan-adherent"/>
    <Group name="db-replicat"/>
  </Group>
 
@@ -297,7 +298,7 @@
      profile="true">
     <Group name="crans-squeeze"/>
     <Group name="domu"/>
-    <Group name="adm-only"/>
+    <Group name="non-vlan-adherent"/>
     <Group name="pgsql-server"/>
     <Group name="sqlgrey-localdb"/>
   </Group>
@@ -360,7 +361,7 @@
 
   <Group name="puppet"
         profile="true">
-    <Group name="adm-only" />
+    <Group name="non-vlan-adherent" />
     <Group name="crans-squeeze"/>
     <Group name="domu"/>
   </Group>
@@ -1233,7 +1234,7 @@
   <Group name="sysctl.local"
     comment="indique l'exsitence de /etc/sysctl.local"/>
 
-  <Group name="adm-only"
+  <Group name="non-vlan-adherent"
          comment="pour les serveurs qui sont seulement sur le vlan adm"/>
 
   <Group name="imprimeurs"
diff --git a/Python/etc/hosts b/Python/etc/hosts
index 3483be5..ae3a792 100644
--- a/Python/etc/hosts
+++ b/Python/etc/hosts
@@ -4,11 +4,14 @@ include("ip")
 
 @127.0.0.1 localhost.crans.org localhost
 
-if not has('adm-only'):
+if not has("non-vlan-adherent"):
     print pubip(), pubhostname, hostname
-    print admip(), admhostname
+    print admip(), admhostname, hostname+".adm"
 else:
     print admip(), admhostname, hostname+".adm", hostname
+
+if has("vlan-wifi"):
+    print wifiip(), wifihostname, hostname+".wifi"
 @10.231.136.7 daath.adm.crans.org daath.adm daath
 if(has("komaz")):
 	print "138.231.135.5 irts-ext.ens-cachan.fr irts"
diff --git a/Python/etc/monit/services b/Python/etc/monit/services
index 35c1990..7d07774 100644
--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@@ -176,7 +176,7 @@ service("ups-server",
         name="upsd",
         pidf="nut/upsd")
 
-if has('adm-only'):
+if has('non-vlan-adherent'):
     vsftpd_ip = admip()
 else:
     vsftpd_ip = pubip()
@@ -307,3 +307,4 @@ for line in metadata.Probes["fstab_local"].splitlines():
 
     print '  mode passive'
     print
+
diff --git a/Python/etc/postfix/canonical b/Python/etc/postfix/canonical
index 7b08326..cd6b94e 100644
--- a/Python/etc/postfix/canonical
+++ b/Python/etc/postfix/canonical
@@ -10,5 +10,5 @@ if has("bug-tracker"):
 
 print "/^(.*)@localhost(\.crans\.org)?$/   ${1}@crans.org"
 print "/^(.*)@%s$/   ${1}@crans.org" % admhostname
-if not has("adm-only"):
+if not has("non-vlan-adherent"):
     print "/^(.*)@%s$/   ${1}@crans.org" % pubhostname
diff --git a/Python/etc/postfix/main.cf b/Python/etc/postfix/main.cf
index 771b23a..1b1e3d0 100644
--- a/Python/etc/postfix/main.cf
+++ b/Python/etc/postfix/main.cf
@@ -25,8 +25,8 @@ tracker = has("tracker")
 # Si vrai, on est sur le tracker debbugs
 bugtracker = has("bug-tracker")
 
-# Si vrai, on est sur un serveur adm-only
-admonly = has("adm-only")
+# Si vrai, on est sur un serveur non-vlan-adherent
+nonadherent = has("non-vlan-adherent")
 
 # La base de donnee utilise (pour les mx)
 if has("ldap"):
@@ -57,7 +57,7 @@ client_networks = ["138.231.136.0/21", "138.231.144.0/21", "138.231.148.0/22"]
 @# +------------------+
 
 @# Definition par securite (sinon il utilise gethostname)
-if admonly:
+if nonadherent:
     myhostname = admhostname
 else:
     myhostname = pubhostname
diff --git a/etc/python/common.py b/etc/python/common.py
index 9dc35fe..84b3e75 100644
--- a/etc/python/common.py
+++ b/etc/python/common.py
@@ -55,9 +55,12 @@ hostname = metadata.hostname.split('.',1)[0]
 # Le nom d'hote sur le vlan public
 pubhostname = hostname + ".crans.org"
 
-# Le nom d'hote sur le vlan
+# Le nom d'hote sur le vlan adm
 admhostname = hostname + ".adm.crans.org"
 
+# Le nom d'hôte sur le vlan wifi
+wifihostname = hostname + ".wifi.crans.org"
+
 def has(group):
     return group in metadata.groups
 
diff --git a/etc/python/ip.py b/etc/python/ip.py
index 93421f1..f046c4c 100644
--- a/etc/python/ip.py
+++ b/etc/python/ip.py
@@ -8,7 +8,7 @@ def pubipof(hostname):
     try:
         return socket.gethostbyname(hostname + ".crans.org")
     except:
-        # Peut-etre un serveur de la ferme ?
+        # Peut-être un serveur de la ferme ?
         return socket.gethostbyname(hostname + ".ferme.crans.org")
 
 def admipof(hostname):