crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sable récupère la même config que sila par generate

Browse source 
darcs-hash:20080511161309-ffbb2-9e55ab83e736de4f479ed8e0c5a3ce0599b3e509.gz
This commit is contained in:
Nicolas Dandrimont 2008-05-11 18:13:09 +02:00
parent eab2195446
commit 89ea3b275f
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gestion/gen_confs/firewall.py
View file

@ -1168,6 +1168,8 @@ class firewall_sila(firewall_rouge):
# Pour le proxy transparent
iptables("-t nat -I PREROUTING -i crans.2 -m mark --mark %s -j ACCEPT" % conf_fw.mark['proxy'])
firewall_sable = firewall_sila
firewall_bleu = firewall_zamok
if __name__ == '__main__' :

14
gestion/gen_confs/generate.py
View file

@ -38,13 +38,13 @@ make_lock('auto_generate', 'Big lock', nowait=1)
class base_reconfigure:
__service_develop = {
'macip': [ 'rouge-macip', 'zamok-macip', 'sila-macip', 'komaz-macip' ],
'macip': [ 'rouge-macip', 'zamok-macip', 'sila-macip', 'sable-macip', 'komaz-macip' ],
'droits': [ 'rouge-droits', 'ragnarok-droits' ],
'blacklist_upload': [ 'sila-blacklist_upload', 'komaz-blacklist' ],
'blacklist_p2p': [ 'sila-blacklist_p2p', 'komaz-blacklist' ],
'blacklist_autodisc_upload': [ 'sila-blacklist_autodisc_upload', 'komaz-blacklist'],
'blacklist_autodisc_p2p': [ 'sila-blacklist_autodisc_p2p', 'komaz-blacklist'],
'blacklist_bloq': [ 'komaz-blacklist', 'sila-blacklist_bloq' ],
'blacklist_upload': [ 'sila-blacklist_upload', 'sable-blacklist_upload', 'komaz-blacklist' ],
'blacklist_p2p': [ 'sila-blacklist_p2p', 'sable-blacklist_p2p', 'komaz-blacklist' ],
'blacklist_autodisc_upload': [ 'sila-blacklist_autodisc_upload', 'sable-blacklist_autodisc_upload', 'komaz-blacklist'],
'blacklist_autodisc_p2p': [ 'sila-blacklist_autodisc_p2p', 'sable-blacklist_autodisc_p2p', 'komaz-blacklist'],
'blacklist_bloq': [ 'komaz-blacklist', 'sila-blacklist_bloq', 'sable-blacklist_bloq' ],
'del_user': [ 'vert-del_user', 'rouge-del_user', 'zamok-del_user' ]
}
@ -256,6 +256,8 @@ class sila(base_reconfigure):
from gen_confs.squid import squid_bloq
self._do(squid_bloq())
sable = sila
class ragnarok(base_reconfigure):
__restart_wifi_update = False