summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index 6b149598..f7c432c0 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -87,7 +87,11 @@ type AnnexUUID = String
annexWebSite :: [Host] -> Git.RepoUrl -> HostName -> AnnexUUID -> [(String, Git.RepoUrl)] -> Property
annexWebSite hosts origin hn uuid remotes = Git.cloned "joey" origin dir Nothing
`onChange` setup
- `onChange` toProp (Apache.siteEnabled hn $ annexwebsiteconf hn)
+ `onChange` setupapache
+ `requires` File.hasPrivContent "/etc/ssl/certs/web.pem"
+ `requires` File.hasPrivContent "/etc/ssl/private/web.pem"
+ `requires` File.hasPrivContent "/etc/ssl/certs/startssl.pem"
+ `requires` toProp (Apache.modEnabled "ssl")
where
dir = "/srv/web/" ++ hn
setup = userScriptProperty "joey" setupscript
@@ -100,6 +104,7 @@ annexWebSite hosts origin hn uuid remotes = Git.cloned "joey" origin dir Nothing
[ "git annex get"
]
addremote (name, url) = "git remote add " ++ shellEscape name ++ " " ++ shellEscape url
+ setupapache = toProp (Apache.siteEnabled hn $ annexwebsiteconf hn)
annexwebsiteconf :: HostName -> Apache.ConfigFile
annexwebsiteconf hn = stanza 80 False ++ stanza 443 True