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])