Rcriture de generate pour la migration.
Mise en place du firewall sur toutes les machines darcs-hash:20050611170224-41617-068d285a581f2c65799ca3fbe33a57a3075b9d03.gz
This commit is contained in:
parent
cf8b87b9b9
commit
caf1bb803e
11 changed files with 1681 additions and 1666 deletions
|
@ -21,6 +21,10 @@ elif hostname == "sila" :
|
|||
anon_bind = 1 # Anonyme pour lecture seule
|
||||
uri = 'ldapi://%2fvar%2frun%2fldapi/'
|
||||
rw_uri = 'ldaps://zamok.crans.org:636/'
|
||||
elif hostname in [ 'bleu' , 'rouge' ] :
|
||||
anon_bind = 0 # Anonyme pour lecture seule
|
||||
uri = 'ldap://vert.adm.crans.org/'
|
||||
rw_uri = uri
|
||||
else :
|
||||
anon_bind = 0 # Doit s'authentifier pour toute action
|
||||
uri = 'ldaps://sila.crans.org:636/'
|
||||
|
@ -46,10 +50,6 @@ except :
|
|||
|
||||
random.seed() # On initialise le générateur aléatoire
|
||||
|
||||
##################################################################################
|
||||
### Différent services redémarrables
|
||||
#dns, dhcp, firewall, bornes_wifi(nom_borne), conf_wifi, bl_carte_etudiant, switch(chbre), dhcp-nectaris
|
||||
|
||||
##################################################################################
|
||||
### Items de la blackliste
|
||||
blacklist_items = { u'bloq' : u'Bloquage total de tout services' ,
|
||||
|
@ -1130,15 +1130,14 @@ class base_proprietaire(base_classes_crans) :
|
|||
or 'paiement-%s' % ann_scol in self.modifs \
|
||||
or ( config.bl_carte_et_definitif and test_carte ) :
|
||||
for m in self.machines() :
|
||||
self.services_to_restart('firewall',[m.ip()] )
|
||||
self.services_to_restart('firewall-komaz',[m.ip()] )
|
||||
self.services_to_restart('macip',[m.ip()] )
|
||||
self.services_to_restart('dns')
|
||||
if m.ipsec() :
|
||||
self.services_to_restart('conf_wifi')
|
||||
self.services_to_restart('dhcp-nectaris')
|
||||
self.services_to_restart('nectaris-dhcp')
|
||||
else :
|
||||
self.services_to_restart('switch',[self.chbre()])
|
||||
self.services_to_restart('dhcp')
|
||||
self.services_to_restart('zamok-dhcp')
|
||||
|
||||
# Vérification si changement de bât, ce qui obligerai un changement d'IP
|
||||
if 'chbre' in self.modifs and self.chbre()!='????' :
|
||||
|
@ -1180,8 +1179,9 @@ class base_proprietaire(base_classes_crans) :
|
|||
|
||||
# Modif des droits ?
|
||||
if 'droits' in self.modifs :
|
||||
self.services_to_restart('droits',[self._data['uid']])
|
||||
|
||||
self.services_to_restart('droits')
|
||||
self.services_to_restart('mail_modif',['uidNumber=%s' % self._data['uid']])
|
||||
|
||||
# Remise à zero
|
||||
self.modifs=[]
|
||||
|
||||
|
@ -2213,15 +2213,15 @@ class machine(base_classes_crans) :
|
|||
|
||||
# Reconfiguration firewalls et dhcps
|
||||
if reconf_ip :
|
||||
self.services_to_restart('firewall' , reconf_ip)
|
||||
self.services_to_restart('firewall-komaz' , reconf_ip)
|
||||
self.services_to_restart('macip',reconf_ip )
|
||||
if self.__typ == 'wifi' :
|
||||
self.services_to_restart('dhcp-nectaris')
|
||||
self.services_to_restart('nectaris-dhcp')
|
||||
else:
|
||||
self.services_to_restart('dhcp')
|
||||
self.services_to_restart('zamok-dhcp')
|
||||
if 'ports' in self.modifs :
|
||||
self.services_to_restart('firewall-komaz-ports', [ self.ip() ] )
|
||||
|
||||
self.services_to_restart('komaz-ports', [ self.ip() ] )
|
||||
self.services_to_restart('mail_modif',['ip=%s' % self.ip()])
|
||||
|
||||
# Reconfiguration DNS ?
|
||||
if 'host' in self.modifs or 'ipHostNumber' in self.modifs or 'hostAlias' in self.modifs :
|
||||
self.services_to_restart('dns')
|
||||
|
@ -2243,7 +2243,7 @@ class machine(base_classes_crans) :
|
|||
# Regénération de l'autostatus et mail de changmement ?
|
||||
if self.proprietaire().__class__ == crans :
|
||||
self.services_to_restart('autostatus')
|
||||
self.services_to_restart('mail_modification_machine',[self.ip()])
|
||||
self.services_to_restart('mail_modif',['ip=%s' % self.ip()])
|
||||
|
||||
# Remise à zéro
|
||||
self.modifs=[]
|
||||
|
@ -2266,13 +2266,12 @@ class machine(base_classes_crans) :
|
|||
# Services à redémarrer
|
||||
if self.__typ == 'wifi' :
|
||||
self.services_to_restart('conf_wifi')
|
||||
self.services_to_restart('dhcp-nectaris')
|
||||
self.services_to_restart('nectaris-dhcp')
|
||||
else:
|
||||
self.services_to_restart('dhcp')
|
||||
self.services_to_restart('zamok-dhcp')
|
||||
|
||||
self.services_to_restart('dns')
|
||||
self.services_to_restart('firewall',[ self.ip() ])
|
||||
self.services_to_restart('firewall-komaz',[ self.ip() ])
|
||||
self.services_to_restart('macip',[self.ip()] )
|
||||
|
||||
def portTCPin(self,ports=None) :
|
||||
""" Ports TCP ouverts depuis l'extérieur pour la machine """
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue