X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/fc489c1628dedacbfca3f709ceac03aee0663b98..f967aa213004eec666fcaca562c1681e143135cf:/local.m4 diff --git a/local.m4 b/local.m4 index 36f76b3..f2b2b9c 100644 --- a/local.m4 +++ b/local.m4 @@ -60,7 +60,7 @@ defnet untrusted untrusted forwards househub defnet vpn safe addr 172.29.199.128/27 - forwards househub + forwards househub colohub host crybaby 1 host terror 2 defnet iodine untrusted @@ -75,29 +75,29 @@ defnet housebdry virtual ## House hosts. defhost radius router - iface eth0 dmz - iface eth1 unsafe + iface eth0 dmz unsafe + iface eth1 dmz unsafe iface eth2 safe iface eth3 untrusted defhost roadstar - iface eth0 dmz - iface eth1 unsafe + iface eth0 dmz unsafe + iface eth1 dmz unsafe defhost jem - iface eth0 dmz - iface eth1 unsafe + iface eth0 dmz unsafe + iface eth1 dmz unsafe defhost artist - iface eth0 dmz - iface eth1 unsafe + iface eth0 dmz unsafe + iface eth1 dmz unsafe defhost vampire router - iface eth0.0 dmz - iface eth0.1 unsafe + iface eth0.0 dmz unsafe + iface eth0.1 dmz unsafe iface eth0.3 untrusted iface dns0 dns iface vpn-+ vpn iface vpn-precision colobdry vpn defhost ibanez - iface br-dmz dmz + iface br-dmz dmz unsafe iface br-unsafe unsafe defhost gibson @@ -118,23 +118,23 @@ defnet colobdry virtual ## Colocated hosts. defhost fender - iface br-jump jump - iface br-colo colo + iface br-jump jump colo + iface br-colo jump colo defhost precision router - iface eth0 jump - iface eth1 colo + iface eth0 jump colo + iface eth1 jump colo iface vpn-+ vpn iface vpn-vampire housebdry vpn defhost telecaster - iface eth0 jump - iface eth1 colo + iface eth0 jump colo + iface eth1 jump colo defhost stratocaster - iface eth0 jump - iface eth1 colo + iface eth0 jump colo + iface eth1 jump colo defhost jazz - iface eth0 jump - iface eth1 colo + iface eth0 jump colo + iface eth1 jump colo ## Other networks. defnet hub virtual