X-Git-Url: https://git.distorted.org.uk/~mdw/zones/blobdiff_plain/07fe1e4376449189989e507690a7f165f3930e6e..76e1e45a2c8886a5d980e283e3972cfa2e627ef6:/distorted.lisp?ds=sidebyside diff --git a/distorted.lisp b/distorted.lisp index acd1263..b0d0d59 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -144,16 +144,6 @@ :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")) @@ -226,6 +216,16 @@ ;; 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)