Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/firewall

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/firewall:
  jazz.m4, numbers.m4: Allow Privoxy access to SGO VPN.
  local.m4: Update external NTP servers.

diff --git a/artist.m4 b/artist.m4
index 2997769..bc07708 100644 (file)
--- a/artist.m4
+++ b/artist.m4
@@ -31,7 +31,7 @@ allowservices inbound tcp \
        ident \
        ftp ftp_data \
        http https \
-       disorder \
+       disorder disorder2 \
        tor_public tor_directory i2p
 allowservices inbound udp \
        i2p

diff --git a/local.m4 b/local.m4
index 760391a..c0874c5 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -224,6 +224,7 @@ defhost precision
        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
@@ -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
+       host mdwdev 2 ::2:1
 
 ## Linode hosts.
 defhost national

diff --git a/numbers.m4 b/numbers.m4
index 0634f9e..456ff84 100644 (file)
--- a/numbers.m4
+++ b/numbers.m4
@@ -68,6 +68,7 @@ defport tor_directory 9030
 defport git 9418
 defport pgp_keys 11371
 defport i2p 16911
+defport disorder2 23598
 defport disorder 23599
 defport udpkey 59274