summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-08 17:52:14 -0400
committerJoey Hess2014-04-08 17:52:14 -0400
commite2d1cf70eb9bfc613d0723c0cc6e0fd2ca6e656c (patch)
tree31d1b0d46968cc1675be01aa9094808ff9b32463 /Propellor/Property
parenta04539a2ee46a3c040bf7a44a6954fa51a035315 (diff)
propellor spin
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/OpenId.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Propellor/Property/OpenId.hs b/Propellor/Property/OpenId.hs
index 2a55ff31..4f22bdb9 100644
--- a/Propellor/Property/OpenId.hs
+++ b/Propellor/Property/OpenId.hs
@@ -7,18 +7,20 @@ import qualified Propellor.Property.Apt as Apt
import Data.List
providerFor :: [UserName] -> String -> Property
-providerFor users baseurl = propertyList ("openid provider") $
+providerFor users baseurl = propertyList desc $
[ serviceRunning "apache2"
`requires` Apt.installed ["apache2"]
, Apt.installed ["simpleid"]
`onChange` serviceRestarted "apache2"
- , File.fileProperty ("simpleid host " ++ baseurl)
+ , File.fileProperty desc
(map setbaseurl) "/etc/simpleid/config.inc"
] ++ map identfile users
where
identfile u = File.hasPrivContent $ concat
[ "/var/lib/simpleid/identities/", u, ".identity" ]
+ url = "http://"++baseurl++"/simpleid"
+ desc = "openid provider " ++ url
setbaseurl l
| "SIMPLEID_BASE_URL" `isInfixOf` l =
- "define('SIMPLEID_BASE_URL', 'http://"++baseurl++"/simpleid');"
+ "define('SIMPLEID_BASE_URL', '"++url++"');"
| otherwise = l