~mdw
/
zones
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hosts.lisp, distorted.lisp: Allocate address for jaguar.
[zones]
/
distorted.lisp
diff --git
a/distorted.lisp
b/distorted.lisp
index
acf66c6
..
0cdd8b3
100644
(file)
--- a/
distorted.lisp
+++ b/
distorted.lisp
@@
-84,8
+84,7
@@
;; Entry is via little router box.
(dmz :net dmz)
;; Entry is via little router box.
(dmz :net dmz)
- (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
- (anon (dmz :a anon.dmz))
+ (guvnor (dmz :a guvnor.dmz))
(gate (dmz :a gate.dmz))
(nat (dmz :a nat.dmz))
(gate (dmz :a gate.dmz))
(nat (dmz :a nat.dmz))
@@
-95,8
+94,8
@@
(evolution :alias evo)
;; Colocated services.
(evolution :alias evo)
;; Colocated services.
- (
irc
(colo :svc jazz.colo)
- (jump :svc jazz.jump))
+ (
(irc vox)
(colo :svc jazz.colo)
+
(jump :svc jazz.jump))
((git www) (colo :svc stratocaster.colo)
(jump :svc stratocaster.jump))
:svc #+view/inside stratocaster.colo
((git www) (colo :svc stratocaster.colo)
(jump :svc stratocaster.jump))
:svc #+view/inside stratocaster.colo
@@
-108,14
+107,16
@@
(dmz :svc artist.dmz))
(pifi (vpn :svc orange.vpn)
(dmz :svc artist.dmz))
(dmz :svc artist.dmz))
(pifi (vpn :svc orange.vpn)
(dmz :svc artist.dmz))
- ((ftp rsync wiki bugs mail db i2p
vox
) :svc vampire)
+ ((ftp rsync wiki bugs mail db i2p) :svc vampire)
;; Internal services.
#+view/inside ((news lpr) :svc vampire.unsafe)
;; Anonymity services.
;; Internal services.
#+view/inside ((news lpr) :svc vampire.unsafe)
;; Anonymity services.
- (tor :svc #+view/inside vampire.unsafe
- #-view/inside anon.dmz)
+ (anon (colo :svc jazz.colo)
+ (unsafe :svc vampire.unsafe)
+ (jump :a anon.jump)
+ (dmz :a anon.dmz))
;; Fancy connectivity.
(iodine (jump :a jazz.jump))
;; Fancy connectivity.
(iodine (jump :a jazz.jump))
@@
-137,6
+138,9
@@
(jump :a jazz.jump)
(iodine :a jazz.iodine))
(jump :a jazz.jump)
(iodine :a jazz.iodine))
+ ;; Media server (on loan to Good Technology HSTG).
+ (jaguar (jump :a jaguar.jump))
+
;; Nicko's server.
(richmond (jump :a richmond.jump))
;; Nicko's server.
(richmond (jump :a richmond.jump))
@@
-159,7
+163,8
@@
(jem (unsafe :a jem.unsafe)
(dmz :a jem.dmz))
(artist (unsafe :a artist.unsafe)
(jem (unsafe :a jem.unsafe)
(dmz :a jem.dmz))
(artist (unsafe :a artist.unsafe)
- (dmz :a artist.dmz))
+ (dmz :a artist.dmz)
+ (untrusted :a artist.untrusted))
;; DHCP hosts.
(gibson :cname gibson.dhcp)
;; DHCP hosts.
(gibson :cname gibson.dhcp)
@@
-173,7
+178,6
@@
(crybaby (vpn :a crybaby.vpn))
(terror (vpn :a terror.vpn))
(orange (vpn :a orange.vpn))
(crybaby (vpn :a crybaby.vpn))
(terror (vpn :a terror.vpn))
(orange (vpn :a orange.vpn))
- (mango (vpn :a mango.vpn))
(iodine :net iodine)
;; ITS.
(iodine :net iodine)
;; ITS.