Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/zones/

diff --git a/distorted.org.uk.lisp b/distorted.org.uk.lisp
index a677d71701a5cfc71f96c99dea551dc123e300b5..e85192270b660b1449fc54882095752de08ad2b3 100644 (file)
--- a/distorted.org.uk.lisp
+++ b/distorted.org.uk.lisp
@@ -16,9 +16,10 @@ (defnet distorted.org.uk 172.29.198.0/23
 
 ;; Host allocations
 (defhost guvnor (unsafe))
-(defhost guvnor.demon 83.105.60.35)
+(defhost guvnor.demon 80.177.3.76)
 (defhost metalzone (unsafe))
 (defhost tubescreamer (safe))
+(defhost obsidian (safe))
 (defhost evolution (unsafe))
 (defhost evolution.wireless (wireless))
 (defhost fuzzface (virtual))
@@ -38,7 +39,7 @@ (defzone distorted.org.uk
   ((@ lists bugs cryptomail) :mx guvnor)
   ;;
   ;; Colocated services
-  ((www ftp wiki) :a boyle.nsict.org)
+  ((www ftp wiki git) :a boyle.nsict.org)
   ;;
   ;; Entry is via little port-forwarding box
   (guvnor (demon :a guvnor.demon)
@@ -54,6 +55,7 @@ (defzone distorted.org.uk
   ;; Wired ethernet
   (metalzone (fretwank :a metalzone))
   (tubescreamer (fretwank :a tubescreamer))
+  (obsidian (fretwank :a obsidian))
   (fuzzface (virtual :a fuzzface))
   (mz (virtual :a mz))
   ;;

diff --git a/distorted.tex b/distorted.tex
index f143903bf5094bb5a88ba52ae8a3ec6feb80b77f..95904b6c7fbf35b0d4abd5859d38544ce275facb 100644 (file)
--- a/distorted.tex
+++ b/distorted.tex
@@ -346,9 +346,7 @@ externally available: these are shown in table~\ref{tab:services}.
     Ident & TCP 113      & NTP & UDP 123%
       %%\footnote{Only to upstream ISP's time servers.}
                                             & HTTPS & TCP 443    \\
-    TrIPE & UDP 22\,003
-      & \multicolumn{2}{c|}{---}
-      & \multicolumn{2}{c|}{---}                                 \\ \hlx{vh}
+    rsync & TCP 873      & GIT & TCP 9418   & TrIPE & UDP 22\,003 \\ \hlx{vh}
   \end{tabular}
   \end{minipage}
 

diff --git a/hosts.lisp b/hosts.lisp
index c98c133f45ddd5be577e94873710288850572750..6287e8bcb6a0797f96e6ff5f42476c92f7b56657 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -1,6 +1,6 @@
 ;; Static IP addresses for various useful hosts
 
-(defhost guvnor.distorted.org.uk 83.105.60.35)
+(defhost guvnor.distorted.org.uk 80.177.3.76)
 (defhost boyle.nsict.org 85.158.42.162)
 (defhost chiark.greenend.org.uk 193.201.200.170)
 (defhost mccoy.flatline.org.uk 80.74.241.31)