hosts.lisp, distorted.lisp: Reinstate IPv6 addresses for `www-cache'!

Upgrading to squid3 was very easy, and it supports IPv6 just fine.

This reverts commit 43fc56bd687d70a16ec7cc6921e5a7681fe2674d.

diff --git a/distorted.lisp b/distorted.lisp
index ae8d6ac..c62ee34 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -93,10 +93,10 @@
   (ntp :cname ntp0)
 
   (www-cache :anycast ((any www-cache.any)
-                      (jump (:ipv4 telecaster.jump))
-                      (dmz (:ipv4 roadstar.dmz))
-                      (unsafe (:ipv4 roadstar.unsafe))
-                      (colo (:ipv4 telecaster.colo))))
+                      (jump telecaster.jump)
+                      (dmz roadstar.dmz)
+                      (unsafe roadstar.unsafe)
+                      (colo telecaster.colo)))
   (wpad :cname www-cache)
 
   (_kerberos :txt "DISTORTED.ORG.UK")

diff --git a/hosts.lisp b/hosts.lisp
index 50c3aa3..46a5697 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -127,7 +127,7 @@
 (defhost dns1.any ((:ipv4 any 1) (:ipv6 any "::1:0")))
 (defhost ntp0.any ((:ipv4 any 2) (:ipv6 any "::2:0")))
 (defhost ntp1.any ((:ipv4 any 3) (:ipv6 any "::3:0")))
-(defhost www-cache.any ((:ipv4 any 4)))
+(defhost www-cache.any ((:ipv4 any 4) (:ipv6 any "::4:0")))
 (defhost krb0.any ((:ipv4 any 5) (:ipv6 any "::5:0")))
 (defhost krb1.any ((:ipv4 any 6) (:ipv6 any "::6:0")))