From 8f813dc87548a88bb28c326745b0399c74e344d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 10 Feb 2015 21:46:31 -0400
Subject: propellor spin

---
 config-joey.hs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'config-joey.hs')

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"
-- 
cgit v1.3-2-g0d8e