From 8d2e46ab98dbdd2391355b2799959dc09c85984f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 7 Apr 2015 12:46:26 -0400
Subject: [PATCH] propellor spin

---
 config-joey.hs                               | 3 +++
 src/Propellor/Property/SiteSpecific/IABak.hs | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/config-joey.hs b/config-joey.hs
index 150c044..513adcf 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -314,6 +314,9 @@ iabak = host "iabak.archiveteam.org"
 	& Apt.installed ["etckeeper"]
 	& Apt.installed ["ssh"]
 	& Apt.installed ["vim", "screen", "less"]
+	& Apt.installed ["netcat"]
+	& Apt.installed ["tmux"]
+	& Apt.installed ["emacs-nox"]
 	& User.hasSomePassword "root"
 	& User.accountFor "joey"
 	& User.hasSomePassword "joey"
diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs
index 52f6e66..d349a7e 100644
--- a/src/Propellor/Property/SiteSpecific/IABak.hs
+++ b/src/Propellor/Property/SiteSpecific/IABak.hs
@@ -5,6 +5,7 @@ import qualified Propellor.Property.Apt as Apt
 import qualified Propellor.Property.Git as Git
 import qualified Propellor.Property.Cron as Cron
 import qualified Propellor.Property.File as File
+import qualified Propellor.Property.Apache as Apache
 
 gitServer :: Property HasInfo
 gitServer = propertyList "iabak git server" $ props
@@ -42,7 +43,7 @@ graphiteServer = propertyList "iabak graphite server" $ props
 		`flagFile` "/etc/graphite-superuser-db48x"
 	-- TODO: deal with passwords somehow
 	& File.ownerGroup "/var/lib/graphite/graphite.db" "_graphite" "_graphite"
-	& File.hasContent "/etc/apache2/iabak-graphite-web.conf"
+	& Apache.siteEnabled "iabak-graphite-web"
 		[ "<VirtualHost *:8080>"
 		, "        WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite"
 		, "        WSGIProcessGroup _graphite"
@@ -57,11 +58,6 @@ graphiteServer = propertyList "iabak graphite server" $ props
 		, "        CustomLog ${APACHE_LOG_DIR}/graphite-web_access.log combined"
 		, "</VirtualHost>"
 		]
-	& cmdProperty "ln" ["-sf", "/etc/apache2/sites-available/iabak-graphite-web.conf",
-	                    "/etc/apache2/sites-enabled/iabak-graphite-web.conf"]
-	& Apt.installed ["netcat"]
-	& Apt.installed ["tmux"]
-	& Apt.installed ["emacs-nox"]
   where
 	graphiteCSRF = withPrivData (Password "csrf-token") (Context "iabak.archiveteam.org") $
 		\gettoken -> property "graphite-web CSRF token" $