[generate] Détermination de certain service a redémarrer à partir d'info de bcfg2

gestion/gen_confs/generate.py

@@ -34,7 +34,11 @@ db = crans_ldap()
 make_lock('auto_generate', 'Big lock', nowait=1)
 
 class base_reconfigure:
-    __firewalled_servers = [ 'redisdead', 'zamok', 'sable', 'komaz', 'routeur' ]
+    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 ],
@@ -53,8 +57,8 @@ class base_reconfigure:
           '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'],
+          '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({
@@ -69,6 +73,8 @@ class base_reconfigure:
           '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