summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OpenId.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 18:23:20 -0400
committerJoey Hess2016-03-07 18:23:20 -0400
commit89f9b3cbe16d708912c91db76ed6a2d5cf9851b2 (patch)
treec4ad9a2b8d7a2e719288e6d38b537d31d1b7633a /src/Propellor/Property/OpenId.hs
parent6eb4f7a2f9bbabc5c606f624e9b8380a16224690 (diff)
parent9556734c02a0b05764e83419ae72710908419cdc (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/OpenId.hs')
-rw-r--r--src/Propellor/Property/OpenId.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/OpenId.hs b/src/Propellor/Property/OpenId.hs
index bafca041..0f73bfb6 100644
--- a/src/Propellor/Property/OpenId.hs
+++ b/src/Propellor/Property/OpenId.hs
@@ -28,21 +28,21 @@ providerFor users hn mp = propertyList desc $ props
where
baseurl = hn ++ case mp of
Nothing -> ""
- Just (Port p) -> ':' : show p
+ Just p -> ':' : fromPort p
url = "http://"++baseurl++"/simpleid"
desc = "openid provider " ++ url
setbaseurl l
- | "SIMPLEID_BASE_URL" `isInfixOf` l =
+ | "SIMPLEID_BASE_URL" `isInfixOf` l =
"define('SIMPLEID_BASE_URL', '"++url++"');"
| otherwise = l
-
+
apacheconfigured = case mp of
Nothing -> toProp $
Apache.virtualHost hn (Port 80) "/var/www/html"
Just p -> propertyList desc $ props
& Apache.listenPorts [p]
& Apache.virtualHost hn p "/var/www/html"
-
+
-- the identities directory controls access, so open up
-- file mode
identfile (User u) = File.hasPrivContentExposed