From ab8552785c97e0f4166dfe327c1e628905d0133c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Fri, 19 Apr 2013 04:24:33 +0200 Subject: [PATCH] =?UTF-8?q?[daath/nfs]=20Alias=20nfs=20cr=C3=A9=C3=A9=20po?= =?UTF-8?q?ur=20r=C3=A9duire=20la=20d=C3=A9pendance=20au=20nom,=20et=20ln?= =?UTF-8?q?=20-s=20/home-adh=20/home?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/gen_confs/adherents.py | 3 --- gestion/gen_confs/firewall4.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gestion/gen_confs/adherents.py b/gestion/gen_confs/adherents.py index 13d6a4d8..fd9eb5a2 100644 --- a/gestion/gen_confs/adherents.py +++ b/gestion/gen_confs/adherents.py @@ -110,9 +110,6 @@ class home: except ValueError: home, uid, login = args.split(',') mail_redirect = None - # Kludge pour daath (nfs) normalement inutile - if home.startswith('/home/') and hostname == "daath": - home = "/home-adh/" + home[6:] ### Home if not os.path.exists(home): # Le home n'existe pas diff --git a/gestion/gen_confs/firewall4.py b/gestion/gen_confs/firewall4.py index e88945ba..69d4156e 100755 --- a/gestion/gen_confs/firewall4.py +++ b/gestion/gen_confs/firewall4.py @@ -890,7 +890,7 @@ class firewall_komaz(firewall_base_routeur): #Classe des decos upload tc('class add dev %s parent 1:2 classid 1:11 ' - 'htb rate 40kbps ceil 40kbps prio 1' % dev['out']) + 'htb rate 30kbps ceil 30kbps prio 1' % dev['out']) tc('qdisc add dev %s parent 1:11 ' 'handle 11: sfq perturb 10' % dev['out']) @@ -984,7 +984,7 @@ class firewall_zamok(firewall_base): self.add(table, chain, '-p udp --dport domain -j ACCEPT') # Pour le nfs (le paquet à laisser passer n'a pas d'owner) - self.add(table, chain, '-d daath.adm.crans.org -j ACCEPT') + self.add(table, chain, '-d nfs.adm.crans.org -j ACCEPT') for user in adm_users: try: self.add(table, chain, '-m owner --uid-owner %d -j ACCEPT' % pwd.getpwnam(user)[2])