summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OpenId.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-26 15:03:56 -0400
committerJoey Hess2016-03-26 15:03:56 -0400
commit341064ea8cfaeb04ec4129239edc096a314de036 (patch)
tree75e6c24ade2258ebc0034ca07bd3c29a3f1da33f /src/Propellor/Property/OpenId.hs
parent551a7ec8bd7486ea599271c99236ceffa1743e5a (diff)
more porting
Diffstat (limited to 'src/Propellor/Property/OpenId.hs')
-rw-r--r--src/Propellor/Property/OpenId.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/OpenId.hs b/src/Propellor/Property/OpenId.hs
index 0f73bfb6..0abf38a6 100644
--- a/src/Propellor/Property/OpenId.hs
+++ b/src/Propellor/Property/OpenId.hs
@@ -16,7 +16,7 @@ import Data.List
--
-- It's probably a good idea to put this property inside a docker or
-- systemd-nspawn container.
-providerFor :: [User] -> HostName -> Maybe Port -> Property HasInfo
+providerFor :: [User] -> HostName -> Maybe Port -> Property (HasInfo + DebianLike)
providerFor users hn mp = propertyList desc $ props
& Apt.serviceInstalledRunning "apache2"
& apacheconfigured
@@ -24,7 +24,7 @@ providerFor users hn mp = propertyList desc $ props
`onChange` Apache.restarted
& File.fileProperty (desc ++ " configured")
(map setbaseurl) "/etc/simpleid/config.inc"
- & propertyList desc (map identfile users)
+ & propertyList desc (toProps $ map identfile users)
where
baseurl = hn ++ case mp of
Nothing -> ""
@@ -37,7 +37,7 @@ providerFor users hn mp = propertyList desc $ props
| otherwise = l
apacheconfigured = case mp of
- Nothing -> toProp $
+ Nothing -> setupRevertableProperty $
Apache.virtualHost hn (Port 80) "/var/www/html"
Just p -> propertyList desc $ props
& Apache.listenPorts [p]