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

[s/daath/zbee/g]

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2013-04-21 23:22:38 +02:00
parent a195e82618
commit 88d435f2ad
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gestion/annuaires_pg.py
View file

@ -214,7 +214,7 @@ uplink_prises={ 'a' :
# peuvent être utiles à connaître # peuvent être utiles à connaître
401: 'uplink->batp0', 402: 'uplink->batp-1', 401: 'uplink->batp0', 402: 'uplink->batp-1',
403: 'uplink->batp2', 403: 'uplink->batp-3', 403: 'uplink->batp2', 403: 'uplink->batp-3',
405: 'libre-service', 406: 'uplink->backbone', 405: 'libre-service', 406: 'uplink->bato-1',
}, },
'o' : 'o' :
{ {
@ -230,7 +230,7 @@ uplink_prises={ 'a' :
'A2': 'komaz-ens', 'B2': 'multiprise-wifi', 'A2': 'komaz-ens', 'B2': 'multiprise-wifi',
'A3': 'sable', 'B3': 'dyson', 'A3': 'sable', 'B3': 'dyson',
'A4': 'komaz', 'B4': 'fy', 'A4': 'komaz', 'B4': 'fy',
'A5': 'malloc-1', 'B5': 'switch-ilo', 'A5': 'zbee' , 'B5': 'switch-ilo',
'B6': 'vigile 0B', 'B6': 'vigile 0B',
'B7': 'daath', 'B7': 'daath',
'B8': 'batb', 'B8': 'batb',

8
gestion/gen_confs/adherents.py
View file

@ -46,7 +46,7 @@ class del_user:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
def delete_daath(self): def delete_zbee(self):
cprint(u'Archivage fichiers utilisateur', 'gras') cprint(u'Archivage fichiers utilisateur', 'gras')
for args in self.args: for args in self.args:
anim('\t' + args) anim('\t' + args)
@ -54,7 +54,7 @@ class del_user:
login, home = args.split(',') login, home = args.split(',')
if not login or not home: if not login or not home:
raise ValueError('Argument invalide') raise ValueError('Argument invalide')
if home.startswith('/home/') and hostname == "daath": if home.startswith('/home/') and hostname == "zbee":
home = "/home-adh/" + home[6:] home = "/home-adh/" + home[6:]
warn = '' warn = ''
f = '%s/files/%s_%s.tar.bz2' % ('/home-adh/cimetiere', f = '%s/files/%s_%s.tar.bz2' % ('/home-adh/cimetiere',
@ -85,8 +85,8 @@ class del_user:
traceback.print_exc() traceback.print_exc()
def reconfigure(self): def reconfigure(self):
if hostname == "daath": if hostname == "zbee":
self.delete_daath() self.delete_zbee()
elif hostname == "owl": elif hostname == "owl":
self.delete_directory(u"Suppression des fichiers index de dovecot", self.delete_directory(u"Suppression des fichiers index de dovecot",
"/var/dovecot-indexes/%s") "/var/dovecot-indexes/%s")

2
gestion/gen_confs/firewall_new.py
View file

@ -1310,7 +1310,7 @@ class firewall_zamok(firewall_crans) :
# Pour le nfs (le paquet à laisser passer n'a pas d'owner) # Pour le nfs (le paquet à laisser passer n'a pas d'owner)
iptables("-A SERV_OUT_ADM -d fx.adm.crans.org -j ACCEPT") iptables("-A SERV_OUT_ADM -d fx.adm.crans.org -j ACCEPT")
iptables("-A SERV_OUT_ADM -d daath.adm.crans.org -j ACCEPT") iptables("-A SERV_OUT_ADM -d nfs.adm.crans.org -j ACCEPT")
# Rien d'autre ne passe # Rien d'autre ne passe
iptables("-A SERV_OUT_ADM -j REJECT --reject-with icmp-net-prohibited") iptables("-A SERV_OUT_ADM -j REJECT --reject-with icmp-net-prohibited")

4
gestion/gen_confs/generate.py
View file

@ -50,7 +50,7 @@ class base_reconfigure:
'blacklist_autodisc_upload': __blacklist_servers, 'blacklist_autodisc_upload': __blacklist_servers,
'blacklist_autodisc_p2p': __blacklist_servers, 'blacklist_autodisc_p2p': __blacklist_servers,
'blacklist_bloq': __blacklist_servers, 'blacklist_bloq': __blacklist_servers,
'del_user': [ 'daath-del_user', 'owl-del_user', 'zamok-del_user' ] 'del_user': [ 'zbee-del_user', 'owl-del_user', 'zamok-del_user' ]
} }
#Y R U Aliasing ! #Y R U Aliasing !
__service_develop.update({ __service_develop.update({
@ -221,7 +221,7 @@ class zamok(base_reconfigure):
from adherents import del_user from adherents import del_user
self._do(del_user(args)) self._do(del_user(args))
class daath(base_reconfigure): class zbee(base_reconfigure):
def home(self, args): def home(self, args):
from adherents import home from adherents import home
self._do(home(args)) self._do(home(args))