diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-07 12:46:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-07 12:46:26 -0400 |
| commit | 8d2e46ab98dbdd2391355b2799959dc09c85984f (patch) | |
| tree | 0ff89d2a27be31dedf4ee547b6c30b342cd71b3e /src | |
| parent | c25be89f874c6822f9f07049577e4e0acb560d57 (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/IABak.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index 52f6e668..d349a7ee 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" $ |