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

Fix Apache.siteEnabled to update the config file and reload apache when configuration has changed.

This commit is contained in:
Joey Hess 2014-12-09 00:34:24 -04:00
parent f8943c2036
commit b22201e36b
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config-joey.hs
View File

@ -76,6 +76,20 @@ darkstar = host "darkstar.kitenet.net"
& Apt.buildDep ["git-annex"] `period` Daily & Apt.buildDep ["git-annex"] `period` Daily
& Docker.configured & Docker.configured
! Docker.docked gitAnnexAndroidDev ! Docker.docked gitAnnexAndroidDev
& website "foo"
website :: String -> RevertableProperty
website hn = Apache.siteEnabled hn apachecfg
where
apachecfg = [ "<VirtualHost *>"
, "DocumentRoot /tmp/xx"
, "<Directory /tmp/xx>"
, " Options Indexes FollowSymLinks Multiviews"
, " Order allow,deny"
, Apache.allowAll
, "</Directory>"
, "</VirtualHost>"
]
clam :: Host clam :: Host
clam = standardSystem "clam.kitenet.net" Unstable "amd64" clam = standardSystem "clam.kitenet.net" Unstable "amd64"

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ propellor (1.2.0) unstable; urgency=medium
* Removed boolProperty; instead the new toResult can be used. (API change) * Removed boolProperty; instead the new toResult can be used. (API change)
* Include Propellor.Property.OS, which was accidentially left out of the * Include Propellor.Property.OS, which was accidentially left out of the
cabal file in the last release. cabal file in the last release.
* Fix Apache.siteEnabled to update the config file and reload apache when
configuration has changed.
-- Joey Hess <id@joeyh.name> Tue, 09 Dec 2014 00:05:09 -0400 -- Joey Hess <id@joeyh.name> Tue, 09 Dec 2014 00:05:09 -0400

11
src/Propellor/Property/Apache.hs
View File

@ -11,12 +11,15 @@ type ConfigFile = [String]
siteEnabled :: HostName -> ConfigFile -> RevertableProperty siteEnabled :: HostName -> ConfigFile -> RevertableProperty
siteEnabled hn cf = RevertableProperty enable disable siteEnabled hn cf = RevertableProperty enable disable
where where
enable = check (not <$> isenabled) $ enable = combineProperties ("apache site enabled " ++ hn)
cmdProperty "a2ensite" ["--quiet", hn] [ siteAvailable hn cf
`describe` ("apache site enabled " ++ hn)
`requires` siteAvailable hn cf
`requires` installed `requires` installed
`onChange` reloaded `onChange` reloaded
, check (not <$> isenabled) $
cmdProperty "a2ensite" ["--quiet", hn]
`requires` installed
`onChange` reloaded
]
disable = combineProperties disable = combineProperties
("apache site disabled " ++ hn) ("apache site disabled " ++ hn)
(map File.notPresent (siteCfg hn)) (map File.notPresent (siteCfg hn))