zamok sert uniquement le fil, nectaris le wifi ; zamok est dsormais
autoritaire. Si nectaris savait ne servir que les relais, il pourrait l'tre aussi. darcs-hash:20050105085321-d1718-28f2da4cc110504f0f3ab319ad08b49461722433.gz
This commit is contained in:
parent
6a37740272
commit
39fd0da800
1 changed files with 6 additions and 9 deletions
|
@ -26,23 +26,21 @@ class dhcp(gen_config) :
|
|||
DHCPD_CONF='/etc/dhcpd.conf'
|
||||
|
||||
# Réseaux servis avec leurs options spécifiques
|
||||
reseaux = { '138.231.136.0/21' :
|
||||
if hostname == 'zamok':
|
||||
reseaux = { '138.231.136.0/21' :
|
||||
"""option routers 138.231.136.4;
|
||||
option domain-name-servers 138.231.136.6, 138.231.136.10, 138.231.136.9;
|
||||
option domain-name "crans.org";
|
||||
option option-119 "crans.org wifi.crans.org";""",
|
||||
|
||||
'138.231.148.0/22' :
|
||||
option option-119 "crans.org wifi.crans.org";""" }
|
||||
elif hostname == 'nectaris':
|
||||
reseaux = { '138.231.148.0/22' :
|
||||
"""option routers 138.231.148.1;
|
||||
not authoritative;
|
||||
option domain-name-servers 138.231.148.1;
|
||||
option domain-name "wifi.crans.org";
|
||||
option option-119 "wifi.crans.org crans.org";"""
|
||||
}
|
||||
|
||||
# Pour nectaris, on sert juste le wifi
|
||||
if hostname == 'nectaris':
|
||||
del reseaux['138.231.136.0/21']
|
||||
|
||||
# Options communes à toutes les réseaux servis
|
||||
base_dhcp="""
|
||||
subnet %(network)s netmask %(netmask)s {
|
||||
|
@ -59,7 +57,6 @@ subnet %(network)s netmask %(netmask)s {
|
|||
option ip-forwarding off;
|
||||
option option-252 "http://www.crans.org/proxy.pac" ;
|
||||
deny unknown-clients;
|
||||
not authoritative;
|
||||
%(HOSTs)s
|
||||
}
|
||||
"""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue