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

nectaris -> ragnarok

Browse source 
darcs-hash:20060205003258-d1718-74486509c1cd5ccff5480da8cf5cce872496b087.gz
This commit is contained in:
bernat 2006-02-05 01:32:58 +01:00
parent d593a7111a
commit b12f1b14b6
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gestion/gen_confs/dhcpd.py
View file

@ -33,7 +33,7 @@ class dhcp(gen_config) :
base_conf = """option option-252 code 252 = text ;
option option-119 code 119 = text ;
"""
elif hostname == 'nectaris' :
elif hostname == 'ragnarok' :
# On rajoute les IP dynamiques
base_conf = """
subnet 10.231.144.0 netmask 255.255.248.0 {
@ -60,7 +60,7 @@ option option-119 code 119 = text ;
option domain-name-servers 138.231.136.3, 138.231.136.10, 138.231.136.9;
option domain-name "crans.org";
option option-119 "crans.org wifi.crans.org";""" }
elif hostname == 'nectaris':
elif hostname == 'ragnarok':
reseaux = { '138.231.148.0/22' :
"""option routers 138.231.148.1;
option domain-name-servers 138.231.148.1;
@ -110,7 +110,7 @@ subnet %(network)s netmask %(netmask)s {
if hostname == 'zamok':
restart_cmd = '/etc/init.d/dhcp restart'
elif hostname == 'nectaris':
elif hostname == 'ragnarok':
restart_cmd = 'kill $(ps auxwwc | awk \'($11 == "dhcpd") {print $2}\') ; sleep 1 ; dhcpd $(grep -v \'^#\' /etc/dhcpd.interfaces | tr \'\\n\' \' \')'
elif hostname == 'rouge' :
restart_cmd = '/etc/init.d/dhcp3-server restart'

2
gestion/gen_confs/generate.py
View file

@ -204,7 +204,7 @@ class sila(base_reconfigure) :
from gen_confs.squid import squid_chbre
self._do(squid_chbre())
class nectaris(base_reconfigure) :
class ragnarok(base_reconfigure) :
__restart_wifi_update = False
def macip(self) :

2
gestion/whos.py
View file

@ -422,7 +422,7 @@ clients_ipsec = None
def ipsec_ok(machine) :
"""Indique si une machine est correctement authentifiée"""
prefix=""
if hostname != "nectaris":
if hostname != "ragnarok":
if not os.path.isfile("/usr/scripts/gestion/clef-encap"):
return None
prefix = "ssh -i /usr/scripts/gestion/clef-encap root@nectaris.crans.org "