summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 13:15:43 -0400
committerJoey Hess2014-05-31 13:15:43 -0400
commit67549db9e95e03c449f1ad6969605801cd731656 (patch)
tree74b67733cbf0cd390172f6e184175115330e9a73
parentfc827aba38fe01a317bc1732ff17e7b77c88c685 (diff)
parent6396e3f547c5b0c0caa32ac27f90ec1d25ac8df1 (diff)
Merge branch 'joeyconfig'
-rw-r--r--config-joey.hs27
1 files changed, 27 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 7d0a4e80..e67bcede 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -306,8 +306,35 @@ monsters = -- but do want to track their public keys etc.
& alias "wortroot.kitenet.net"
& alias "www.wortroot.kitenet.net"
& alias "joey.kitenet.net"
+ & alias "anna.kitenet.net"
& alias "ipv6.kitenet.net"
& alias "bitlbee.kitenet.net"
+ {- Remaining services on kite:
+ -
+ - mail
+ - postfix
+ - postgrey
+ - mailman
+ - spamassassin
+ - sqwebmail
+ - courier
+ - imap
+ - tls
+ - apache
+ - some static websites
+ - bitlbee
+ - prosody
+ - (used by anna and daddy's git-annex)
+ - named
+ - (branchable is still pushing to here
+ - (thinking it's ns2.branchable.com), but it's no
+ - longer a primary or secondary for anything)
+ - ajaxterm
+ - ftpd (EOL)
+ -
+ - user shell stuff:
+ - pine, zsh, make, ...
+ -}
, host "mouse.kitenet.net"
& ipv6 "2001:4830:1600:492::2"
, host "beaver.kitenet.net"