nectaris -> ragnarok

darcs-hash:20060210183443-d1718-8e9e89d8f3955a7caf9d9beb63299ca0a7cf1050.gz
This commit is contained in:
bernat 2006-02-10 19:34:43 +01:00
parent 11606e95b1
commit 0e8054b24f
2 changed files with 4 additions and 4 deletions

View file

@ -37,7 +37,7 @@ make_lock('auto_generate','Big lock',nowait=1)
class base_reconfigure : class base_reconfigure :
__service_develop = { __service_develop = {
'macip' : [ 'rouge-macip', 'zamok-macip', 'sila-macip' , 'komaz-macip' ] , 'macip' : [ 'rouge-macip', 'zamok-macip', 'sila-macip' , 'komaz-macip' ] ,
'droits': [ 'rouge-droits', 'nectaris-droits' ] , 'droits': [ 'rouge-droits', 'ragnarok-droits' ] ,
'blacklist_upload' : [ 'bl_squid_upload' , 'komaz-blacklist'] , 'blacklist_upload' : [ 'bl_squid_upload' , 'komaz-blacklist'] ,
'blacklist_p2p' : [ 'bl_squid_upload' , 'komaz-blacklist'] , 'blacklist_p2p' : [ 'bl_squid_upload' , 'komaz-blacklist'] ,
'blacklist_autodisc' : [ 'komaz-blacklist'] } 'blacklist_autodisc' : [ 'komaz-blacklist'] }

View file

@ -1389,7 +1389,7 @@ class base_proprietaire(base_classes_crans):
self.services_to_restart('dns') self.services_to_restart('dns')
if m.ipsec(): if m.ipsec():
self.services_to_restart('conf_wifi_ng') self.services_to_restart('conf_wifi_ng')
self.services_to_restart('nectaris-dhcp') self.services_to_restart('ragnarok-dhcp')
else: else:
self.services_to_restart('switch',[self.chbre()]) self.services_to_restart('switch',[self.chbre()])
self.services_to_restart('rouge-dhcp') self.services_to_restart('rouge-dhcp')
@ -2545,7 +2545,7 @@ class machine(base_classes_crans):
if reconf_ip: if reconf_ip:
self.services_to_restart('macip',reconf_ip ) self.services_to_restart('macip',reconf_ip )
if self.__typ == 'wifi' : if self.__typ == 'wifi' :
self.services_to_restart('nectaris-dhcp') self.services_to_restart('ragnarok-dhcp')
else: else:
self.services_to_restart('rouge-dhcp') self.services_to_restart('rouge-dhcp')
if 'ports' in self.modifs: if 'ports' in self.modifs:
@ -2604,7 +2604,7 @@ class machine(base_classes_crans):
# Services à redémarrer # Services à redémarrer
if self.__typ == 'wifi' : if self.__typ == 'wifi' :
self.services_to_restart('conf_wifi_ng') self.services_to_restart('conf_wifi_ng')
self.services_to_restart('nectaris-dhcp') self.services_to_restart('ragnarok-dhcp')
else: else:
self.services_to_restart('rouge-dhcp') self.services_to_restart('rouge-dhcp')