darcs-hash:20041215105432-41617-c478c1770eeca8be8956369c10efa10f76986f64.gz
This commit is contained in:
pauget 2004-12-15 11:54:32 +01:00
parent c46f607095
commit 66fb4cee44

View file

@ -31,7 +31,7 @@ elif hostname == 'nectaris' :
elif hostname == 'sila' :
args_autorises += [ 'bl_squid_upload', 'blacklist_virus' , 'blacklist_warez' , 'bl_chbre_invalide', 'bl_carte_etudiant' ]
elif hostname == 'komaz' :
args_autorises += [ 'firewall-komaz' , 'firewall-komaz-ports' , 'firewall-komaz-blacklist']
args_autorises += [ 'firewall-komaz=' , 'firewall-komaz-ports=' , 'firewall-komaz-blacklist']
# On vérifie que l'on est root
if os.getuid() != 0:
@ -250,7 +250,7 @@ if hostname == 'zamok':
if 'blacklist_upload' in to_do.keys() :
if auto : db.services_to_restart('-blacklist_upload')
db.services_to_restart('bl_squid_upload')
db.services_to_restart('firewall-komaz-upload')
db.services_to_restart('firewall-komaz-blacklist')
try:
from gen_confs.firewall import bl_upload_fw
a = bl_upload_fw()
@ -448,7 +448,7 @@ elif hostname == 'komaz' :
if 'firewall-komaz-blacklist' in to_do.keys() :
if auto : db.services_to_restart('-firewall-komaz-blacklist')
try :
fw.blacklist(to_do['firewall-komaz-blacklist'])
fw.blacklist()
except :
if auto : db.services_to_restart('firewall-komaz-blacklist',to_do['firewall-komaz-blacklist'])