~mdw
/
firewall
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/firewall
[firewall]
/
local.m4
diff --git
a/local.m4
b/local.m4
index
2bd9f86
..
c0874c5
100644
(file)
--- a/
local.m4
+++ b/
local.m4
@@
-27,7
+27,7
@@
m4_divert(6)m4_dnl
## Default NTP servers.
defconf(ntp_servers,
m4_divert(6)m4_dnl
## Default NTP servers.
defconf(ntp_servers,
- "
158.152.1.76 158.152.1.204 194.159.253.2 195.173.57.232
")
+ "
81.187.26.174 90.155.23.205 2001:8b0:0:23::205 185.73.44.6 2001:ba8:0:2c06::
")
m4_divert(-1)
###--------------------------------------------------------------------------
m4_divert(-1)
###--------------------------------------------------------------------------
@@
-224,6
+224,7
@@
defhost precision
iface vpn-radius housebdry vpn sgo
iface vpn-chiark sgo
iface vpn-national upn
iface vpn-radius housebdry vpn sgo
iface vpn-chiark sgo
iface vpn-national upn
+ iface vpn-mdwdev upn
iface vpn-+ vpn
defhost telecaster
iface eth0 jump colo
iface vpn-+ vpn
defhost telecaster
iface eth0 jump colo
@@
-270,6
+271,7
@@
defnet upn untrusted
addr 172.29.198.160/27 2001:ba8:1d9:a000::/64
via colohub
host national 1 ::1:1
addr 172.29.198.160/27 2001:ba8:1d9:a000::/64
via colohub
host national 1 ::1:1
+ host mdwdev 2 ::2:1
## Linode hosts.
defhost national
## Linode hosts.
defhost national