diff --git a/gestion/gen_confs/dhcpd_new.py b/gestion/gen_confs/dhcpd_new.py index df2e71e8..f5ac1574 100644 --- a/gestion/gen_confs/dhcpd_new.py +++ b/gestion/gen_confs/dhcpd_new.py @@ -88,13 +88,17 @@ class dhcp(gen_config) : '10.42.0.0/16' : '/etc/dhcp3/generated/gratuit.liste', '10.2.9.0/24' : '/etc/dhcp3/generated/appartements.liste', '138.231.144.0/21' : '/etc/dhcp3/generated/wifi.liste' } + elif hostname == 'isc': + restart_cmd = '/etc/init.d/isc-dhcp-server restart' + reseaux = { '138.231.136.0/21' : '/etc/dhcp3/generated/adherents.liste', + '10.42.0.0/16' : '/etc/dhcp3/generated/gratuit.liste', + '10.2.9.0/24' : '/etc/dhcp3/generated/appartements.liste', + '138.231.144.0/21' : '/etc/dhcp3/generated/wifi.liste' } else: restart_cmd = '' reseaux = {} dhcplease='/var/lib/dhcp/dhcpd.leases' - - host_template = """ host %(nom)s { hardware ethernet %(mac)s; @@ -142,8 +146,6 @@ class dhcp(gen_config) : os.rename(self.dhcplease+'.new',self.dhcplease) return - - def _gen(self) : """Construction de la liste des machines appartenant à un réseau """ diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 0e6fc947..6a52afaf 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -54,6 +54,7 @@ class base_reconfigure: 'del_user': [ 'zbee-del_user', 'owl-del_user', 'zamok-del_user' ], 'port': ['komaz-port'], 'dhcp': ['dhcp-dhcp'], + 'isc': ['isc-dhcp'], } #Y R U Aliasing ! __service_develop.update({ @@ -276,6 +277,11 @@ class dhcp(base_reconfigure): from gen_confs.dhcpd_new import dhcp self._do(dhcp(), db.search("mid=*")['machine']) +class isc(base_reconfigure): + def dhcp(self): + from gen_confs.dhcpd_new import dhcp + self._do(dhcp(), db.search("mid=*")['machine']) + class sable(base_reconfigure): def dns(self):