summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-10 21:46:31 -0400
committerJoey Hess2015-02-10 21:46:31 -0400
commit8f813dc87548a88bb28c326745b0399c74e344d8 (patch)
tree0e519d5199c16ebcf4c3ff661e2a412a1085fdeb /config-joey.hs
parent3274a2493022b7ac16156a7173b1ba5eca026976 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs23
1 files changed, 12 insertions, 11 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 6acba336..99deef43 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -173,13 +173,23 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& alias "mail.kitenet.net"
& JoeySites.kiteMailServer
+ & JoeySites.kitenetHttps
+ & Apache.multiSSL
+ & JoeySites.legacyWebSites
+
+ & alias "git.kitenet.net"
+ & alias "git.joeyh.name"
+ & JoeySites.gitServer hosts
+
+ & JoeySites.downloads hosts
+ & JoeySites.gitAnnexDistributor
+ & JoeySites.tmp
+
& alias "ns4.kitenet.net"
& myDnsSecondary
& alias "ns4.branchable.com"
& branchableSecondary
- & JoeySites.legacyWebSites
-
& alias "bitlbee.kitenet.net"
& Apt.serviceInstalledRunning "bitlbee"
& "/etc/bitlbee/bitlbee.conf" `File.hasContent`
@@ -204,15 +214,6 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Docker.configured
& Docker.garbageCollected `period` Daily
! Docker.docked oldusenetShellBox
-
- & alias "git.kitenet.net"
- & alias "git.joeyh.name"
- & JoeySites.gitServer hosts
-
- & JoeySites.downloads hosts
- & JoeySites.gitAnnexDistributor
-
- & JoeySites.tmp
diatom :: Host
diatom = standardSystem "diatom.kitenet.net" (Stable "wheezy") "amd64"