~mdw
/
firewall
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
local.m4: Prepare for switchover to A&A.
[firewall]
/
local.m4
diff --git
a/local.m4
b/local.m4
index
e456e77
..
b0a4e4c
100644
(file)
--- a/
local.m4
+++ b/
local.m4
@@
-43,6
+43,10
@@
m4_divert(-1)
## House border network (dmz). We have all of these, but .145
## is reserved for the router.
##
## House border network (dmz). We have all of these, but .145
## is reserved for the router.
##
+## 81.2.113.195, 81.187.238.128/28
+## House border network (aaisp). We have all of these; the
+## loose address is for the router.
+##
## 212.13.18.64/28
## Jump colocated network (jump). .65--68 are used by Jump
## network infrastructure; we get the rest.
## 212.13.18.64/28
## Jump colocated network (jump). .65--68 are used by Jump
## network infrastructure; we get the rest.
@@
-79,6
+83,10
@@
m4_divert(-1)
## 2001:470:9740::/48
## Main house range. See below for allocation policy.
##
## 2001:470:9740::/48
## Main house range. See below for allocation policy.
##
+## 2001:8b0:c92::/48
+## Main house range (aaisp). See below for allocation policy.
+## There is no explicit DMZ allocation (and no need for one).
+##
## 2001:ba8:0:1d9::/64
## Jump border network (jump): :1 is the router (supplied by
## Jump); other addresses are ours.
## 2001:ba8:0:1d9::/64
## Jump border network (jump): :1 is the router (supplied by
## Jump); other addresses are ours.
@@
-114,7
+122,7
@@
m4_divert(-1)
## Define the available network classes.
m4_divert(42)m4_dnl
## Define the available network classes.
m4_divert(42)m4_dnl
-defnetclass scary scary trusted mcast
+defnetclass scary scary trusted mcast
defnetclass untrusted scary untrusted trusted mcast
defnetclass trusted scary untrusted trusted safe noloop mcast
defnetclass safe trusted safe noloop mcast
defnetclass untrusted scary untrusted trusted mcast
defnetclass trusted scary untrusted trusted safe noloop mcast
defnetclass safe trusted safe noloop mcast
@@
-131,6
+139,7
@@
m4_divert(26)m4_dnl
## House networks.
defnet dmz trusted
addr 62.49.204.144/28 2001:470:1f09:1b98::/64
## House networks.
defnet dmz trusted
addr 62.49.204.144/28 2001:470:1f09:1b98::/64
+ addr 81.2.113.195 81.187.238.128/28 2001:8b0:c92::/48
via unsafe untrusted
defnet unsafe trusted
addr 172.29.199.0/25 2001:470:9740:1::/64
via unsafe untrusted
defnet unsafe trusted
addr 172.29.199.0/25 2001:470:9740:1::/64
@@
-165,6
+174,9
@@
defhost roadstar
defhost jem
iface eth0 dmz unsafe
iface eth1 dmz unsafe
defhost jem
iface eth0 dmz unsafe
iface eth1 dmz unsafe
+defhost universe
+ iface eth0 dmz unsafe
+ iface eth1 dmz unsafe
defhost artist
hosttype router
iface eth0 dmz unsafe untrusted
defhost artist
hosttype router
iface eth0 dmz unsafe untrusted
@@
-220,6
+232,7
@@
defhost precision
iface vpn-mango binswood
iface vpn-radius housebdry vpn sgo
iface vpn-chiark sgo
iface vpn-mango binswood
iface vpn-radius housebdry vpn sgo
iface vpn-chiark sgo
+ iface vpn-national upn
iface vpn-+ vpn
defhost telecaster
iface eth0 jump colo
iface vpn-+ vpn
defhost telecaster
iface eth0 jump colo
@@
-262,6
+275,12
@@
defnet default scary
defnet upn untrusted
addr 172.29.198.160/27 2001:ba8:1d9:a000::/64
via colohub
defnet upn untrusted
addr 172.29.198.160/27 2001:ba8:1d9:a000::/64
via colohub
+ host national 1 ::1:1
+
+## Linode hosts.
+defhost national
+ iface eth0 default
+ iface vpn-precision colohub
## Satellite networks.
defnet binswood noloop
## Satellite networks.
defnet binswood noloop