~mdw
/
firewall
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into emergency
[firewall]
/
local.m4
diff --git
a/local.m4
b/local.m4
index
8f39161
..
4385223
100644
(file)
--- a/
local.m4
+++ b/
local.m4
@@
-47,20
+47,20
@@
m4_divert(26)m4_dnl
## House networks.
defnet dmz trusted
## House networks.
defnet dmz trusted
- addr 62.49.204.144/28
+ addr 62.49.204.144/28
2001:470:1f09:1b98::/64
forwards unsafe untrusted
defnet unsafe trusted
forwards unsafe untrusted
defnet unsafe trusted
- addr 172.29.199.0/25
+ addr 172.29.199.0/25
2001:470:9740:1::/64
forwards househub
defnet safe safe
forwards househub
defnet safe safe
- addr 172.29.199.192/2
8
+ addr 172.29.199.192/2
7 2001:470:9740:4001::/64
forwards househub
defnet untrusted untrusted
forwards househub
defnet untrusted untrusted
- addr 172.29.198.0/25
+ addr 172.29.198.0/25
2001:470:9740:8001::/64
forwards househub
defnet vpn safe
forwards househub
defnet vpn safe
- addr 172.29.199.128/27
- forwards househub
+ addr 172.29.199.128/27
2001:ba8:1d9:6000::/64
+ forwards househub
colohub
host crybaby 1
host terror 2
defnet iodine untrusted
host crybaby 1
host terror 2
defnet iodine untrusted
@@
-75,8
+75,8
@@
defnet housebdry virtual
## House hosts.
defhost radius
router
## House hosts.
defhost radius
router
- iface eth0 dmz unsafe
- iface eth1 dmz unsafe
+ iface eth0 dmz unsafe
safe
+ iface eth1 dmz unsafe
safe
iface eth2 safe
iface eth3 untrusted
defhost roadstar
iface eth2 safe
iface eth3 untrusted
defhost roadstar
@@
-90,8
+90,9
@@
defhost artist
iface eth1 dmz unsafe
defhost vampire
router
iface eth1 dmz unsafe
defhost vampire
router
- iface eth0.0 dmz unsafe default
- iface eth0.1 dmz unsafe default
+ iface eth0.0 dmz unsafe safe default
+ iface eth0.1 dmz unsafe safe default
+ iface eth0.2 safe
iface eth0.3 untrusted default
iface dns0 dns
iface vpn-+ vpn
iface eth0.3 untrusted default
iface dns0 dns
iface vpn-+ vpn
@@
-106,10
+107,10
@@
defhost gibson
## Colocated networks.
defnet jump trusted
## Colocated networks.
defnet jump trusted
- addr 212.13.198.64/28
+ addr 212.13.198.64/28
2001:ba8:0:1d9::/64
forwards colohub
defnet colo trusted
forwards colohub
defnet colo trusted
- addr 172.29.199.176/28
+ addr 172.29.199.176/28
2001:ba8:1d9:2::/64
forwards colohub
defnet colohub virtual
forwards colobdry jump colo
forwards colohub
defnet colohub virtual
forwards colobdry jump colo
@@
-141,8
+142,9
@@
defhost jazz
defnet hub virtual
forwards housebdry colobdry
defnet default untrusted
defnet hub virtual
forwards housebdry colobdry
defnet default untrusted
- addr 62.49.204.144/28
- addr 212.13.198.64/28
+ addr 62.49.204.144/28 2001:470:1f09:1b98::/64
+ addr 212.13.198.64/28 2001:ba8:0:1d9::/64
+ addr 2001:ba8:1d9::/48 #temporary
forwards dmz untrusted unsafe jump colo
m4_divert(80)m4_dnl
forwards dmz untrusted unsafe jump colo
m4_divert(80)m4_dnl