distorted.lisp: Service name for published `i2p' service.

diff --git a/distorted.lisp b/distorted.lisp
index 2dab68a40ea2d03ff96ceeaa3e5d19491d533c59..ddcec182869b2043669c82f5e28f5b2c1eb3649a 100644 (file)
--- 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.)
 (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.)
   (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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Main zone definition.


@@ -98,7 +100,7 @@ (defzone distorted.org.uk
   ((www ftp wiki git bugs mail)
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
   ((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))
    (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))
   ;;
   ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.


@@ -151,6 +151,10 @@ (defzone dhcp.distorted.org.uk
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :net dhcp)
 
   :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)))
 
 (defzone dhcp.199.29.172.in-addr.arpa
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire)))