diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 1323edc6..8346a081 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -34,41 +34,47 @@ db = crans_ldap() make_lock('auto_generate', 'Big lock', nowait=1) class base_reconfigure: - __firewalled_servers = [ 'redisdead', 'zamok', 'sable', 'komaz', 'routeur' ] - __blacklist_servers = [ _s + '-blacklist' for _s in __firewalled_servers ] - __service_develop = { - 'macip': [ _s + '-macip' for _s in __firewalled_servers ], -# 'droits': [ 'rouge-droits', 'ragnarok-droits' ], - 'blacklist': __blacklist_servers, - 'bl_carte_etudiant': __blacklist_servers, - 'bl_chbre_invalide': __blacklist_servers, - 'blacklist_mail_invalide': __blacklist_servers, - 'blacklist_virus': __blacklist_servers, - 'blacklist_warez': __blacklist_servers, - 'blacklist_ipv6_ra': __blacklist_servers, - 'blacklist_upload': __blacklist_servers, - 'blacklist_p2p': __blacklist_servers, - 'blacklist_autodisc_virus': __blacklist_servers, - 'blacklist_autodisc_upload': __blacklist_servers, - 'blacklist_autodisc_p2p': __blacklist_servers, - 'blacklist_bloq': __blacklist_servers, - 'del_user': [ 'zbee-del_user', 'owl-del_user', 'zamok-del_user' ], - 'port': ['komaz-port'], - 'dhcp': ['dhcp-dhcp', 'isc-dhcp'], + try: + sys.path.append('/etc/crans/') + from services import services as __services + sys.path.pop() + __firewalled_servers = __services.get('firewall', []) + __blacklist_servers = [ _s + '-blacklist' for _s in __firewalled_servers ] + __service_develop = { + 'macip': [ _s + '-macip' for _s in __firewalled_servers ], +# 'droits': [ 'rouge-droits', 'ragnarok-droits' ], + 'blacklist': __blacklist_servers, + 'bl_carte_etudiant': __blacklist_servers, + 'bl_chbre_invalide': __blacklist_servers, + 'blacklist_mail_invalide': __blacklist_servers, + 'blacklist_virus': __blacklist_servers, + 'blacklist_warez': __blacklist_servers, + 'blacklist_ipv6_ra': __blacklist_servers, + 'blacklist_upload': __blacklist_servers, + 'blacklist_p2p': __blacklist_servers, + 'blacklist_autodisc_virus': __blacklist_servers, + 'blacklist_autodisc_upload': __blacklist_servers, + 'blacklist_autodisc_p2p': __blacklist_servers, + 'blacklist_bloq': __blacklist_servers, + 'del_user': [ 'zbee-del_user', 'owl-del_user', 'zamok-del_user' ], + 'port': ['%s-port' % _s for _s in __services.get('connection-main', [])], + 'dhcp': [ "%s-dhcp" % _s for _s in __services.get('isc-dhcp-server', []) ], } #Y R U Aliasing ! - __service_develop.update({ - 'mail_invalide':__service_develop['blacklist_mail_invalide'], - 'virus':__service_develop['blacklist_virus'], - 'warez':__service_develop['blacklist_warez'], - 'ipv6_ra':__service_develop['blacklist_ipv6_ra'], - 'upload': __service_develop['blacklist_upload'], - 'p2p': __service_develop['blacklist_p2p'], - 'autodisc_virus':__service_develop['blacklist_autodisc_virus'], - 'autodisc_upload': __service_develop['blacklist_autodisc_upload'], - 'autodisc_p2p': __service_develop['blacklist_autodisc_p2p'], - 'bloq': __service_develop['blacklist_bloq'], + __service_develop.update({ + 'mail_invalide':__service_develop['blacklist_mail_invalide'], + 'virus':__service_develop['blacklist_virus'], + 'warez':__service_develop['blacklist_warez'], + 'ipv6_ra':__service_develop['blacklist_ipv6_ra'], + 'upload': __service_develop['blacklist_upload'], + 'p2p': __service_develop['blacklist_p2p'], + 'autodisc_virus':__service_develop['blacklist_autodisc_virus'], + 'autodisc_upload': __service_develop['blacklist_autodisc_upload'], + 'autodisc_p2p': __service_develop['blacklist_autodisc_p2p'], + 'bloq': __service_develop['blacklist_bloq'], }) + except ImportError: + __service_develop = {} def __init__(self, to_do=None): @@ -310,7 +316,7 @@ if __name__ == '__main__': syslog(str(x)) except UnicodeDecodeError: syslog("%s: non imprimable" % x.nom) - classe = eval(hostname) + classe = getattr(sys.modules[__name__], hostname, base_reconfigure) args_autorises = ['quiet', 'remove=', 'add=', 'list', 'help', 'reconnect'] # Ajout aussi des arguments spécifiques à la machine