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