From 995d75b4eba7a9f016a2a3ef0fa56225f85f1c91 Mon Sep 17 00:00:00 2001 Message-Id: <995d75b4eba7a9f016a2a3ef0fa56225f85f1c91.1715704920.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 17 Apr 2010 19:27:51 +0100 Subject: [PATCH] distorted.lisp: Service name for published `i2p' service. Organization: Straylight/Edgeware From: Mark Wooding --- distorted.lisp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index 2dab68a..ddcec18 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -57,10 +57,12 @@ (setf *default-zone-admin* "hostmaster@distorted.org.uk") (preferred-subnet-case (fretwank (setf *default-zone-source* 'vampire.distorted.org.uk.) - (defhost www-frontend metalzone)) + (defhost www-frontend metalzone) + (defhost dns-frontend vampire)) (t (setf *default-zone-source* 'guvnor.distorted.org.uk.) - (defhost www-frontend guvnor.demon))) + (defhost www-frontend guvnor.demon) + (defhost dns-frontend guvnor.demon))) ;;;-------------------------------------------------------------------------- ;;; Main zone definition. @@ -98,7 +100,7 @@ (defzone distorted.org.uk ((www ftp wiki git bugs mail) (inet :svc guvnor.demon) (fretwank :svc metalzone)) - ((db tor rawk) + ((db tor i2p rawk) (inet :svc guvnor.demon) (fretwank :svc vampire)) (vox (inet :svc guvnor.demon) (fretwank :svc vampire)) @@ -128,9 +130,7 @@ (defzone distorted.org.uk ;; ;; Delegations #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns)) - (io :ns #-subnet/fretwank (metalzone.ns.distorted.org.uk.) - #+subnet/fretwank (metalzone.ns.distorted.org.uk. - vampire.ns.distorted.org.uk.))) + (io :ns ((ns.io :ip dns-frontend)))) ;;;-------------------------------------------------------------------------- ;;; Other subsidiary zones. @@ -151,6 +151,10 @@ (defzone dhcp.distorted.org.uk :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire)) :net dhcp) +(defzone io.distorted.org.uk + :ns ((ns :ip dns-frontend)) + (about :txt "Fake zone used for IP-over-DNS tunnelling.")) + (defzone dhcp.199.29.172.in-addr.arpa :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))) -- [mdw]