distorted.lisp: Reorder the network infrastructure hosts.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index acd1263688eac16a96a0e16a924ba5de717c22c4..b0d0d593a40b8cc4206847298c2a4ac8e60e66d3 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -144,16 +144,6 @@ (defzone distorted.org.uk
   :srv ((:http www)
        (:ftp ftp))
 
   :srv ((:http www)
        (:ftp ftp))
 

-  ;; Entry is via little router box.
-  (dmz :net dmz)
-  (guvnor (dmz :addr guvnor.dmz))
-  (nat (dmz :addr nat.dmz))
-
-  ;; Wireless gateway.
-  (wireless :net wireless)
-  (evolution (safe :addr evolution.safe))
-  (evolution :alias evo)
-

   ;; Colocated services.
   ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
                  (jump :svc jazz.jump :sshfp "jazz"))
   ;; Colocated services.
   ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
                  (jump :svc jazz.jump :sshfp "jazz"))


@@ -226,6 +216,16 @@ (defzone distorted.org.uk
   ;; Nicko's server.
   (richmond (jump :svc richmond.jump))
 
   ;; Nicko's server.
   (richmond (jump :svc richmond.jump))
 

+  ;; Entry is via little router box.
+  (dmz :net dmz)
+  (guvnor (dmz :addr guvnor.dmz))
+  (nat (dmz :addr nat.dmz))
+
+  ;; Wireless gateway.
+  (wireless :net wireless)
+  (evolution (safe :addr evolution.safe))
+  (evolution :alias evo)
+

   ;; Wired ethernet.
   (unsafe :net unsafe)
   (safe :net safe)
   ;; Wired ethernet.
   (unsafe :net unsafe)
   (safe :net safe)