~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
d084db4
..
c479ed8
100644
(file)
--- a/
local.m4
+++ b/
local.m4
@@
-92,13
+92,14
@@
defhost artist
iface eth1 dmz unsafe
defhost vampire
router
iface eth1 dmz unsafe
defhost vampire
router
- iface eth0.0 dmz unsafe safe
- iface eth0.1 dmz unsafe safe
+ iface eth0.0 dmz unsafe safe
default
+ iface eth0.1 dmz unsafe safe
default
iface eth0.2 safe
iface eth0.2 safe
- iface eth0.3 untrusted
+ iface eth0.3 untrusted
default
iface dns0 dns
iface vpn-+ vpn
iface vpn-precision colobdry vpn
iface dns0 dns
iface vpn-+ vpn
iface vpn-precision colobdry vpn
+ iface t6-he default
defhost ibanez
iface br-dmz dmz unsafe
iface br-unsafe unsafe
defhost ibanez
iface br-dmz dmz unsafe
iface br-unsafe unsafe