cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-04-13 18:41:02 -04:00
parent b345271f0b
commit b143b5af13
Failed to extract signature
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -87,7 +87,11 @@ type AnnexUUID = String
annexWebSite :: [Host] -> Git.RepoUrl -> HostName -> AnnexUUID -> [(String, Git.RepoUrl)] -> Property annexWebSite :: [Host] -> Git.RepoUrl -> HostName -> AnnexUUID -> [(String, Git.RepoUrl)] -> Property
annexWebSite hosts origin hn uuid remotes = Git.cloned "joey" origin dir Nothing annexWebSite hosts origin hn uuid remotes = Git.cloned "joey" origin dir Nothing
`onChange` setup `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 where
dir = "/srv/web/" ++ hn dir = "/srv/web/" ++ hn
setup = userScriptProperty "joey" setupscript setup = userScriptProperty "joey" setupscript
@ -100,6 +104,7 @@ annexWebSite hosts origin hn uuid remotes = Git.cloned "joey" origin dir Nothing
[ "git annex get" [ "git annex get"
] ]
addremote (name, url) = "git remote add " ++ shellEscape name ++ " " ++ shellEscape url addremote (name, url) = "git remote add " ++ shellEscape name ++ " " ++ shellEscape url
setupapache = toProp (Apache.siteEnabled hn $ annexwebsiteconf hn)
annexwebsiteconf :: HostName -> Apache.ConfigFile annexwebsiteconf :: HostName -> Apache.ConfigFile
annexwebsiteconf hn = stanza 80 False ++ stanza 443 True annexwebsiteconf hn = stanza 80 False ++ stanza 443 True