diff options
| author | Joey Hess <joey@kitenet.net> | 2014-05-10 11:13:47 -0300 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-10 11:13:47 -0300 |
| commit | eb6e6fe11290971b37a18d9a78f6d9b78228c06f (patch) | |
| tree | 5c7669b6ce12a8e7c95e918e69548de31eb4fba7 /config-joey.hs | |
| parent | 6088df9105a10ef446cc236982c2e30857182a84 (diff) | |
| parent | d7ad05acaaf05c7af066c1d41f3e70e61a9bec96 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs index a35f77bd..c7c3f3be 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -72,14 +72,17 @@ hosts = -- (o) ` & alias "ns9.kitenet.net" & myDnsSecondary - - & Docker.garbageCollected `period` Daily - & Apt.installed ["git-annex", "mtr", "screen"] + + & alias "znc.kitenet.net" + & JoeySites.ircBouncer -- Nothing is using https on clam, so listen on that port -- for ssh, for traveling on bad networks. & "/etc/ssh/sshd_config" `File.containsLine` "Port 443" `onChange` Service.restarted "ssh" + + & Docker.garbageCollected `period` Daily + & Apt.installed ["git-annex", "mtr", "screen"] -- Orca is the main git-annex build box. , standardSystem "orca.kitenet.net" Unstable "amd64" @@ -330,6 +333,7 @@ monsters = -- but do want to track their public keys etc. & alias "joey.kitenet.net" & alias "annex.kitenet.net" & alias "ipv6.kitenet.net" + & alias "bitlbee.kitenet.net" , host "mouse.kitenet.net" & ipv6 "2001:4830:1600:492::2" , host "beaver.kitenet.net" |