From 89ea3b275f2d218a3a1cce2871b35946561e8489 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Sun, 11 May 2008 18:13:09 +0200 Subject: [PATCH] =?UTF-8?q?Sable=20r=C3=A9cup=C3=A8re=20la=20m=C3=AAme=20c?= =?UTF-8?q?onfig=20que=20sila=20par=20generate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit darcs-hash:20080511161309-ffbb2-9e55ab83e736de4f479ed8e0c5a3ce0599b3e509.gz --- gestion/gen_confs/firewall.py | 2 ++ gestion/gen_confs/generate.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gestion/gen_confs/firewall.py b/gestion/gen_confs/firewall.py index 2099f05e..537c79a5 100755 --- a/gestion/gen_confs/firewall.py +++ b/gestion/gen_confs/firewall.py @@ -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__' : diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 372baaf8..1ac85fbe 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -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