pf-tools/pf-tools: network-interface.sample looks like file will...
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Fri Jan 9 07:49:29 UTC 2015
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/a95e1e7c2a1b
changeset: 1438:a95e1e7c2a1b
user: melkor <melkor at sitadelle.com>
date: Fri Jan 09 08:48:35 2015 +0100
description:
network-interface.sample looks like file will be generated from hostfile-links-sample
diffstat:
doc/hostfile-links-sample | 31 ++++++--------
doc/network-interface.sample | 35 +++++++---------
doc/networkfile.sample | 90 ++++++++++++++++++++++----------------------
3 files changed, 74 insertions(+), 82 deletions(-)
diffs (270 lines):
diff -r e07431ad206c -r a95e1e7c2a1b doc/hostfile-links-sample
--- a/doc/hostfile-links-sample Fri Jan 09 08:28:03 2015 +0100
+++ b/doc/hostfile-links-sample Fri Jan 09 08:48:35 2015 +0100
@@ -10,41 +10,36 @@
tag = vlan-admindsi
[link::net-pfds-ext]
- dev = bond0
- ip = 92
- @route = 224.0.0.0/4
+ dev = bond0
+ ip = 92
@route = default via GATEWAY
- @option = slaves eth0 eth1
+ @option = slaves eth2 eth3
@option = bond_mode active-backup
@option = bond_miimon 100
[link::net-pfds-ext::1]
- dev = bond0
+ dev = bond0
comment = another IP on the same VLAN
- ip = link::mirrors
+ ip = link::mirrors
[link::net-pfds-ext::2]
- dev = eth2:1
+ dev = eth2:1
comment = IP aliasing on the same VLAN
- ip = 98
+ ip = 98
[link::net-pfds-ext-v6]
- dev = bond0
- ip = 1077:af68:1c24:7806
+ dev = bond0
+ ip = 1077:af68:1c24:7806
@route = default via GATEWAY
[link::net-serpe]
- dev = lo
- ip = link::vip-serpe
+ dev = lo
+ ip = link::vip-serpe
[link::net-dhcp]
dev = br0
- method = dhcp
- @option = bridge_ports eth3 eth4
-
-[zelda::net-hyrule]
- dev = princess0
- method = captive
+ method = dhcp
+ @option = bridge_ports eth4 eth5
[deployment]
mode = debian
diff -r e07431ad206c -r a95e1e7c2a1b doc/network-interface.sample
--- a/doc/network-interface.sample Fri Jan 09 08:28:03 2015 +0100
+++ b/doc/network-interface.sample Fri Jan 09 08:48:35 2015 +0100
@@ -2,45 +2,42 @@
iface lo inet loopback
iface lo inet static
- address 82.0.0.1
- netmask 255.255.255.255
+ address 93.21.12.217
+ netmask 255.255.255.252
iface eth3 inet dhcp
auto eth0
iface eth0 inet static
- address 10.128.3.6
+ address 10.128.3.0
netmask 255.255.0.0
network 10.128.0.0
dns-nameservers 10.1.1.254 10.1.167.0 10.1.167.1
dns-search private
+auto eth0.302
+iface eth0.302 inet static
+ address 10.111.204.12
+
auto bond0
iface bond0 inet static
- address 93.25.78.12
+ address 93.20.126.92
netmask 255.255.255.0
- network 93.25.78.0
- gateway 93.25.78.1
+ network 93.20.126.0
+ gateway 93.20.126.1
slaves eth2 eth3
bond-mode active-backup
bond-miimon 100
- bond-downdelay 200
- bond-updelay 200
-auto bond0
+iface bond0 inet static
+ address 93.20.126.99
+ netmask 255.255.255.0
+
iface bond0 inet6 static
- address 2a02:8400:4:cb:10e7:9a22:f666:9daf
+ address 2a02:8400:4:cb:1077:af68:1c24:7806
netmask 64
gateway 2a02:8400:4:cb::1
-auto eth0.124
-iface eth0.124 inet static
- address 10.111.12.14
- netmask 255.255.255.0
- network 10.111.12.0
- up ip r a 10.111.37.0/24 via 10.111.12.1 dev eth0.124
- down ip r a 10.111.37.0/24 via 10.111.12.1 dev eth0.124
-
# Bridge setup
iface br0 inet dhcp
- bridge_ports eth0 eth1
+ bridge_ports eth4 eth5
diff -r e07431ad206c -r a95e1e7c2a1b doc/networkfile.sample
--- a/doc/networkfile.sample Fri Jan 09 08:28:03 2015 +0100
+++ b/doc/networkfile.sample Fri Jan 09 08:48:35 2015 +0100
@@ -1,47 +1,47 @@
[cbv4-pfds]
- type = site
- coment = Root site PFDS
+ type = site
+ coment = Root site PFDS
location = Courbevoie
- room = 010D (ex Tele 2)
- state = ROOT
+ room = 010D (ex Tele 2)
+ state = ROOT
dhcpvlan = vlan-systeme
- console = default
- zone = private
+ console = default
+ zone = private
[cbv4]
- type = site
- coment = POP Courbevoie (CBV4)
+ type = site
+ coment = POP Courbevoie (CBV4)
location = Courbevoie
- room = 010D (ex Tele 2)
- state = EDGE
- console = default
- zone = private
+ room = 010D (ex Tele 2)
+ state = EDGE
+ console = default
+ zone = private
dhcpvlan = vlan-systeme
[private]
- type = zone
+ type = zone
comment = Zone de gestion interne plateforme
- serial = AUTO
- soa = Deploy00.private.
- mail = dnsmaster at private
- refresh = 6H ; Refresh (6 hours)
- retry = 1H ; Retry (1 hour)
- expire = 7D ; Expire (7 days)
- negttl = 1H ; Negative TTL (1 hours)
- ttl = 1D ; TTL (1 day)
- @ns = deploy00.vlan-systeme.private.
- @ns = deploy01.vlan-systeme.private.
- @mx = 1 mf.private.
- @mx = 2 mf00.private.
- @mx = 2 mf01.private.
- console = ttyS0,115200n8
+ serial = AUTO
+ soa = Deploy00.private.
+ mail = dnsmaster at private
+ refresh = 6H ; Refresh (6 hours)
+ retry = 1H ; Retry (1 hour)
+ expire = 7D ; Expire (7 days)
+ negttl = 1H ; Negative TTL (1 hours)
+ ttl = 1D ; TTL (1 day)
+ @ns = deploy00.vlan-systeme.private.
+ @ns = deploy01.vlan-systeme.private.
+ @mx = 1 mf.private.
+ @mx = 2 mf00.private.
+ @mx = 2 mf01.private.
+ console = ttyS0,115200n8
[vip-spawn]
- type = server
- site = cbv4-pfds
- comment = VIP for accessing to spawn functionnality
- order = 2
- number = 1
+ type = server
+ site = cbv4-pfds
+ comment = VIP for accessing to spawn functionnality
+ order = 2
+ number = 1
ip.net-systeme = 167.254
ip.net-pfds-ext = 99
shortname = net-systeme
@@ -53,13 +53,13 @@
alias.vip-deploy = net-systeme
[vip-serpe]
- type = server
- comment = IP Anycast pour serpe
- site = ALL
- order = 2
- number = 1
- shortname = net-serpe
- ip.net-serpe = 217
+ type = server
+ comment = IP Anycast pour serpe
+ site = ALL
+ order = 2
+ number = 1
+ shortname = net-serpe
+ ip.net-serpe = 217
[network-common]
type = include
@@ -91,36 +91,36 @@
[net-pfds-ext]
type = network
- comment = IP unique
+ comment = IP unique
network = 93.20.126.0/24
scope = global
gateway = 254
[net-pfds-ext-v6]
type = network
- comment = IP unique
+ comment = IP unique
network = 2a02:8400:4:cb/64
scope = global
gateway = 1
[net-systeme]
type = network
- comment = IP unique sur un site donné
+ comment = IP unique sur un site donné
network = 10.128.0.0/16
scope = local
gateway = 1
[net-serpe]
type = network
- comment = réseau anycast
+ comment = réseau anycast
network = 93.21.12.216/30
scope = global
gateway = 217
- routing = anycast
+ routing = anycast
[net-multicast]
type = network
- comment = réseau multicast
+ comment = réseau multicast
network = 224.0.0.0/4
scope = global
routing = multicast
More information about the pf-tools-commits
mailing list