Éclatement de config.py en plusieurs sous-module de config. L'API reste à peu près la même, il faut juste penser à import config.submodule avant d'utilisr config.submodule (confid.dns, config.upload par exemple)

Tous les autres fichiers modifiés le sont pour compatibilité avec ce changement.

Ce commit implique des commits du même genre dans l'intranet2, lc_ldap et bcfg2.

gestion/gen_confs/adherents.py

@@ -8,6 +8,7 @@ import smtplib, sys, commands, shutil, os, traceback
 sys.path.append('/usr/scripts/gestion')
 from affich_tools import cprint, anim, OK, WARNING, ERREUR
 import config
+import config.mails
 from time import strftime
 from ldap_crans import hostname, crans_ldap
 
@@ -172,7 +173,7 @@ class mail_bienvenue:
                     else:
                         To += '@crans.org'
                 conn=smtplib.SMTP('localhost')
-                conn.sendmail(From, To, config.txt_mail_bienvenue.encode('utf-8') % { 'From': From, 'To': To })
+                conn.sendmail(From, To, config.mails.txt_mail_bienvenue.encode('utf-8') % { 'From': From, 'To': To })
                 conn.quit()
                 print OK
             except Exception, c:
@@ -198,11 +199,11 @@ class mail_ajout_droits:
                 To = login
                 if To.find('@') == -1: To += '@crans.org'
                 print Droit +"\n"
-                if Droit in config.pages_infos_droits:
+                if Droit in config.mails.pages_infos_droits:
                     print "envoi du mail"
-                    Page = config.pages_infos_droits[Droit.encode('utf-8')]
+                    Page = config.mails.pages_infos_droits[Droit.encode('utf-8')]
                     conn=smtplib.SMTP('localhost')
-                    conn.sendmail(From, To, config.txt_ajout_droits.encode('utf-8') % { 'From': From, 'To': To , 'Droit': Droit, 'Page': Page})
+                    conn.sendmail(From, To, config.mails.txt_ajout_droits.encode('utf-8') % { 'From': From, 'To': To , 'Droit': Droit, 'Page': Page})
                     conn.quit()
                     print OK
                 else:

gestion/gen_confs/bind.py

@@ -12,6 +12,7 @@ from socket import gethostname
 from gen_confs import gen_config
 
 import config
+import config.dns
 from iptools import AddrInNet, AddrInNets
 import ip6tools
 

gestion/gen_confs/firewall.py

@@ -35,7 +35,7 @@ from ldap_crans import AssociationCrans, Machine, MachineWifi, BorneWifi
 from affich_tools import *
 from commands import getstatusoutput
 from iptools import AddrInNet, NetSubnets, IpSubnet
-from config import NETs, mac_komaz, mac_wifi, mac_titanic, mac_g, conf_fw, p2p, vlans, debit_max_radin, adm_users
+from config import NETs, mac_komaz, mac_wifi, mac_titanic, conf_fw, p2p, vlans, debit_max_radin, adm_users
 syslog.openlog('firewall')
 
 debug = 1

gestion/gen_confs/firewall6.py

@@ -25,9 +25,8 @@ import sys, re, os, pwd
 sys.path.append('/usr/scripts/gestion')
 
 from ldap_crans import hostname
-from config import conf_fw, rid, prefix, role, file_pickle, open_ports
+from config import conf_fw, rid, prefix, role, file_pickle, open_ports, p2p
 from config import authorized_icmpv6, mac_wifi, adm_only, adm_users
-from config import udp_torrent_tracker
 from ipt import *
 
 # On invoque Ip6tables
@@ -43,7 +42,7 @@ Usage:
 """ % { 'script' : sys.argv[0].split('/')[-1] }
 
 def tracker_torrent(ip6tables):
-    for tracker in udp_torrent_tracker:
+    for tracker in p2p.udp_torrent_tracker:
         for dest in gethostbyname(tracker)[1]:
             ip6tables.filter.tracker_torrent('-p udp -d %s -j LOG --log-level notice --log-prefix "TRACKER:%s "' % (dest,(tracker[:20]) if len(tracker) > 20 else tracker))
             ip6tables.filter.tracker_torrent('-p udp -d %s -j REJECT --reject-with icmp6-adm-prohibited' % dest)

gestion/gen_confs/firewall_new.py

@@ -37,7 +37,7 @@ from ldap_crans import AssociationCrans, Machine, MachineWifi, BorneWifi
 from affich_tools import *
 from commands import getstatusoutput
 from iptools import AddrInNet, NetSubnets, IpSubnet
-from config import NETs, mac_komaz, mac_wifi, mac_titanic, mac_g, conf_fw, p2p, vlans, debit_max_radin, adm_users, accueil_route, blacklist_sanctions, blacklist_sanctions_soft, periode_transitoire, udp_torrent_tracker
+from config import NETs, mac_komaz, mac_wifi, mac_titanic, conf_fw, p2p, vlans, debit_max_radin, adm_users, accueil_route, blacklist_sanctions, blacklist_sanctions_soft, periode_transitoire
 from ipset import IpsetError, Ipset
 from lc_ldap import lc_ldap
 from ipt import gethostbyname
@@ -1240,7 +1240,7 @@ class firewall_komaz(firewall_crans) :
             iptables('-A FILTRE_P2P -m ipp2p --%s -j REJECT --reject-with icmp-admin-prohibited' % filtre[0])
             self.anim.cycle()
         #on rejetes les trackeur udp les plus connus
-        for tracker in udp_torrent_tracker:
+        for tracker in p2p.udp_torrent_tracker:
             for dest in gethostbyname(tracker)[0]:
                 iptables('-A FILTRE_P2P -p udp -d %s -j LOG --log-level notice --log-prefix "TRACKER:%s "' % (dest,(tracker[:20]) if len(tracker) > 20 else tracker))
                 iptables('-A FILTRE_P2P -p udp -d %s -j REJECT --reject-with icmp-admin-prohibited' % dest)

gestion/gen_confs/generate.py

@@ -21,7 +21,6 @@ from ldap_crans import crans_ldap, hostname
 from lock import *
 from affich_tools import anim, cprint, OK
 from time import localtime, strftime, time, sleep
-import config
 import ridtools
 from inspect import getargspec
 from syslog import *

gestion/gen_confs/ipset.py

@@ -23,7 +23,6 @@ import commands
 import lock
 
 import lc_ldap
-import config
 import secrets
 
 class IpsetError(Exception):