[Mails] Bye bye rouge

Ignore-this: 41f78b2bd4df9b4411c032a4169574be

darcs-hash:20120802160424-ab199-b3db7d18ed58b1e64d8dba4ee919e6870f4457a8.gz
This commit is contained in:
becue 2012-08-02 18:04:24 +02:00
parent 7fcc468cab
commit b7e9acf9f1
13 changed files with 40 additions and 52 deletions

View file

@ -40,7 +40,7 @@ make_lock('auto_generate', 'Big lock', nowait=1)
class base_reconfigure:
__service_develop = {
'macip': [ 'rouge-macip', 'zamok-macip', 'sable-macip', 'komaz-macip', 'gordon-macip',
'macip': [ 'redisdead-macip', 'zamok-macip', 'sable-macip', 'komaz-macip', 'gordon-macip',
'sable-blacklist_check' ],
# 'droits': [ 'rouge-droits', 'ragnarok-droits' ],
'blacklist_upload': [ 'sable-blacklist_upload', 'komaz-blacklist', 'zamok-blacklist' ],
@ -48,7 +48,7 @@ class base_reconfigure:
'blacklist_autodisc_upload': [ 'sable-blacklist_autodisc_upload', 'komaz-blacklist', 'zamok-blacklist'],
'blacklist_autodisc_p2p': [ 'sable-blacklist_autodisc_p2p', 'komaz-blacklist', 'zamok-blacklist'],
'blacklist_bloq': [ 'komaz-blacklist', 'sable-blacklist_bloq', 'zamok-blacklist', 'dns' ],
'del_user': [ 'fx-del_user', 'rouge-del_user', 'zamok-del_user' ]
'del_user': [ 'fx-del_user', 'owl-del_user', 'zamok-del_user' ]
}
def __init__(self, to_do=None):
@ -149,15 +149,9 @@ class redisdead(base_reconfigure):
from adherents import ML_ens
self._do(ML_ens(mails))
class rouge(base_reconfigure):
def autostatus(self):
from autostatus import autostatus
self._do(autostatus())
# def dhcp(self):
# from gen_confs.dhcpd import dhcp
# self._do(dhcp(), self._machines())
def mail_ajout_droits(self, args):
from adherents import mail_ajout_droits
self._do(mail_ajout_droits(args))
def mail_modif(self, trucs):
"""
@ -171,19 +165,21 @@ class rouge(base_reconfigure):
from gen_confs.supervison import mail_solde
self._do(mail_solde(modifs))
def switch(self, chambres):
from gen_confs.switchs import switch
self._do(switch(chambres))
class rouge(base_reconfigure):
def autostatus(self):
from autostatus import autostatus
self._do(autostatus())
# def dhcp(self):
# from gen_confs.dhcpd import dhcp
# self._do(dhcp(), self._machines())
class owl(base_reconfigure):
def del_user(self, args):
# Suppression des fichiers index de dovecot
from adherents import del_user
self._do(del_user(args))
def mail_ajout_droits(self, args):
from adherents import mail_ajout_droits
self._do(mail_ajout_droits(args))
class pgsql(base_reconfigure):
def surveillance_exemptions(self):
from gen_confs.surveillance import exemptions