~mdw
/
zones
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
distorted.lisp: New alias `git-master' for vampire.
[zones]
/
distorted.lisp
diff --git
a/distorted.lisp
b/distorted.lisp
index
90f5d88
..
3ca4392
100644
(file)
--- a/
distorted.lisp
+++ b/
distorted.lisp
@@
-48,11
+48,13
@@
;; Wireless gateway.
(wireless :net wireless)
;; Wireless gateway.
(wireless :net wireless)
- (evolution (untrusted :a evolution.untrusted))
+ (evolution (safe :a evolution.safe))
+ (evolution :alias evo)
;; Local services.
:svc vampire
;; Local services.
:svc vampire
- ((www krb ftp rsync wiki git bugs mail db i2p rawk vox www-cache)
+ ((www krb ftp rsync wiki git git-master
+ bugs mail db i2p rawk vox www-cache)
:svc vampire)
;; Internal services.
:svc vampire)
;; Internal services.
@@
-85,6
+87,7
@@
(untrusted :net untrusted)
(vampire (unsafe :a vampire.unsafe)
(dmz :a vampire.dmz)
(untrusted :net untrusted)
(vampire (unsafe :a vampire.unsafe)
(dmz :a vampire.dmz)
+ (safe :a vampire.safe)
(untrusted :a vampire.untrusted)
(iodine :a vampire.iodine))
(obsidian (safe :a obsidian.safe))
(untrusted :a vampire.untrusted)
(iodine :a vampire.iodine))
(obsidian (safe :a obsidian.safe))
@@
-92,6
+95,7
@@
(dmz :a ibanez.dmz))
(radius (unsafe :a radius.unsafe)
(dmz :a radius.dmz)
(dmz :a ibanez.dmz))
(radius (unsafe :a radius.unsafe)
(dmz :a radius.dmz)
+ (safe :a radius.safe)
(untrusted :a radius.untrusted))
(roadstar (unsafe :a roadstar.unsafe)
(dmz :a roadstar.dmz))
(untrusted :a radius.untrusted))
(roadstar (unsafe :a roadstar.unsafe)
(dmz :a roadstar.dmz))
@@
-108,9
+112,9
@@
(invader :cname invader.dhcp)
;; Virtual network.
(invader :cname invader.dhcp)
;; Virtual network.
- (v
irtual :net virtual
)
- (crybaby (v
irtual :a crybaby.virtual
))
- (terror (v
irtual :a terror.virtual
))
+ (v
pn :net vpn
)
+ (crybaby (v
pn :a crybaby.vpn
))
+ (terror (v
pn :a terror.vpn
))
(iodine :net iodine)
;; ITS.
(iodine :net iodine)
;; ITS.
@@
-128,7
+132,10
@@
(defrevzone trusted
:ns ((radius.ns :ip radius)
(vampire.ns :ip vampire))
(defrevzone trusted
:ns ((radius.ns :ip radius)
(vampire.ns :ip vampire))
- :reverse trusted
+ :reverse unsafe
+ :reverse vpn
+ :reverse colo
+ :reverse its
(dhcp :ns (radius.ns vampire.ns))
:cidr-delegation
(trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
(dhcp :ns (radius.ns vampire.ns))
:cidr-delegation
(trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))