~mdw
/
zones
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
distorted.lisp: Announce an IRC server.
[zones]
/
distorted.lisp
diff --git
a/distorted.lisp
b/distorted.lisp
index
01fc902
..
601897a
100644
(file)
--- a/
distorted.lisp
+++ b/
distorted.lisp
@@
-16,9
+16,10
@@
;; Nameservers.
:ns #+view/inside ((radius.ns :ip radius)
;; Nameservers.
:ns #+view/inside ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
#-view/inside ((radius.ns :ip radius)
(vampire.ns :ip vampire))
#-view/inside ((radius.ns :ip radius)
- (
vampire.ns :ip vampire
)
+ (
precision.ns :ip precision
)
(mythic-beasts-1.ns :ip mythic-ns1)
(mythic-beasts-2.ns :ip mythic-ns2)
(chiark.ns :ip chiark.greenend.org.uk))
(mythic-beasts-1.ns :ip mythic-ns1)
(mythic-beasts-2.ns :ip mythic-ns2)
(chiark.ns :ip chiark.greenend.org.uk))
@@
-67,6
+68,10
@@
(evolution (safe :a evolution.safe))
(evolution :alias evo)
(evolution (safe :a evolution.safe))
(evolution :alias evo)
+ ;; Colocated services.
+ (irc (colo :svc stratocaster.colo)
+ (jump :svc stratocaster.jump))
+
;; Local services.
:svc vampire
((www krb ftp rsync wiki git bugs mail db i2p rawk vox)
;; Local services.
:svc vampire
((www krb ftp rsync wiki git bugs mail db i2p rawk vox)
@@
-85,17
+90,17
@@
;; Colocated hosts.
(colo :net colo)
(jump :net jump)
;; Colocated hosts.
(colo :net colo)
(jump :net jump)
- (fender
;
(colo :a fender.colo)
+ (fender (colo :a fender.colo)
(jump :a fender.jump))
(jump :a fender.jump))
- (precision
;
(colo :a precision.colo)
+ (precision (colo :a precision.colo)
(jump :a precision.jump))
(jump :a precision.jump))
- (telecaster
;
(colo :a telecaster.colo)
+ (telecaster (colo :a telecaster.colo)
(jump :a telecaster.jump))
(telecaster :alias tele)
(jump :a telecaster.jump))
(telecaster :alias tele)
- (stratocaster
;
(colo :a stratocaster.colo)
+ (stratocaster (colo :a stratocaster.colo)
(jump :a stratocaster.jump))
(stratocaster :alias strat)
(jump :a stratocaster.jump))
(stratocaster :alias strat)
- (jazz
;
(colo :a jazz.colo)
+ (jazz (colo :a jazz.colo)
(jump :a jazz.jump))
;; Wired ethernet.
(jump :a jazz.jump))
;; Wired ethernet.
@@
-142,7
+147,12
@@
(blackhole (jump :a blackhole.jump))
;; Delegations.
(blackhole (jump :a blackhole.jump))
;; Delegations.
- (dhcp :ns (radius.ns vampire.ns))
+ (dhcp :ns ((radius.ns.dhcp :ip radius)
+ (precision.ns.dhcp :ip precision)
+ (vampire.ns.dhcp :ip vampire)))
+ (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+ (precision.ns.dnserr :ip precision.jump)
+ (vampire.ns.dnserr :ip vampire.dmz)))
(io :ns ((ns.io :ip iodine.dmz))))
;;;--------------------------------------------------------------------------
(io :ns ((ns.io :ip iodine.dmz))))
;;;--------------------------------------------------------------------------
@@
-150,23
+160,28
@@
(defrevzone trusted
:ns ((radius.ns :ip radius)
(defrevzone trusted
:ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
:reverse unsafe
:reverse vpn
:reverse colo
:reverse its
:reverse any
(vampire.ns :ip vampire))
:reverse unsafe
:reverse vpn
:reverse colo
:reverse its
:reverse any
- (dhcp :ns (radius.ns vampire.ns))
+ (dhcp :ns ((radius.ns.dhcp :ip radius)
+ (precision.ns.dhcp :ip precision)
+ (vampire.ns.dhcp :ip vampire)))
:cidr-delegation
(trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
(defrevzone dmz
:ns ((radius.ns :ip radius)
:cidr-delegation
(trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
(defrevzone dmz
:ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
:reverse dmz)
(defrevzone jump
:ns ((radius.ns :ip radius)
(vampire.ns :ip vampire))
:reverse dmz)
(defrevzone jump
:ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
:reverse jump)
(vampire.ns :ip vampire))
:reverse jump)