diff --git a/gestion/gen_confs/adherents.py b/gestion/gen_confs/adherents.py index f1dfe712..66caa319 100644 --- a/gestion/gen_confs/adherents.py +++ b/gestion/gen_confs/adherents.py @@ -56,10 +56,10 @@ class del_user: if home.startswith('/home/') and hostname == "fx": home = "/home-adh/" + home[6:] warn = '' - f = '%s/files/%s_%s.tar.bz2' % (config.cimetiere, + f = '%s/files/%s_%s.tar.bz2' % ('/home-adh/cimetiere', strftime('%Y-%m-%d-%Hh%Mm'), login) - status, output = commands.getstatusoutput("tar cjf '%s' '%s' /var/spool/mail/%s" % (f, home, login)) + status, output = commands.getstatusoutput("tar cjf '%s' '%s' /home-adh/mail/%s" % (f, home, login)) if (status != 512 and status != 0) or not os.path.isfile(f): # La 512 est si un des paths n'exite pas. raise OSError(output) @@ -67,10 +67,10 @@ class del_user: shutil.rmtree(home) else: warn += '%s incorrect\n' % home - if os.path.isdir('/var/spool/mail/' + login): - shutil.rmtree('/var/spool/mail/' + login) + if os.path.isdir('/home-adh/mail/' + login): + shutil.rmtree('/home-adh/mail/' + login) else: - warn += '/var/spool/mail/%s incorrect\n' % login + warn += '/home-adh/mail/%s incorrect\n' % login if warn: print WARNING if self.debug: diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 8a553336..db838c89 100644 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -45,7 +45,7 @@ class base_reconfigure: 'blacklist_autodisc_upload': [ 'sable-blacklist_autodisc_upload', 'komaz-blacklist'], 'blacklist_autodisc_p2p': [ 'sable-blacklist_autodisc_p2p', 'komaz-blacklist'], 'blacklist_bloq': [ 'komaz-blacklist', 'sable-blacklist_bloq' ], - 'del_user': [ 'vert-del_user', 'rouge-del_user', 'zamok-del_user' ] + 'del_user': [ 'fx-del_user', 'rouge-del_user', 'zamok-del_user' ] } def __init__(self, to_do=None):