summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-04-23 09:24:53 -0400
committerJoey Hess2015-04-23 09:24:53 -0400
commit2d7c493403766871731121ac967672aa9440d2e8 (patch)
tree305c86d576f59147ef33afb8ac30b0c239acba57
parent4a187cbd22820df2fa807848fa629b2819b2362a (diff)
parent89b6629464b6dbd27e8393181421e0089ae5f5f4 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
-rw-r--r--src/Propellor/Property/File.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/IABak.hs3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index 46704746..adced166 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -35,7 +35,7 @@ hasPrivContentExposed f = hasPrivContentExposedFrom (PrivDataSourceFile (PrivFil
hasPrivContentExposedFrom :: (IsContext c, IsPrivDataSource s) => s -> FilePath -> c -> Property HasInfo
hasPrivContentExposedFrom = hasPrivContent' writeFile
-hasPrivContent' :: (IsContext c, IsPrivDataSource s) => (String -> FilePath -> IO ()) -> s -> FilePath -> c -> Property HasInfo
+hasPrivContent' :: (IsContext c, IsPrivDataSource s) => (FilePath -> String -> IO ()) -> s -> FilePath -> c -> Property HasInfo
hasPrivContent' writer source f context =
withPrivData source context $ \getcontent ->
property desc $ getcontent $ \privcontent ->
diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs
index f50482ff..650014f4 100644
--- a/src/Propellor/Property/SiteSpecific/IABak.hs
+++ b/src/Propellor/Property/SiteSpecific/IABak.hs
@@ -42,6 +42,9 @@ registrationServer knownhosts = propertyList "iabak registration server" $ props
& cmdProperty "ln" ["-sf", "/home/registrar/IA.BAK/registrar/register.cgi", link]
& cmdProperty "chown" ["-h", "registrar:registrar", link]
& File.containsLine "/etc/sudoers" "www-data ALL=(registrar) NOPASSWD:/home/registrar/IA.BAK/registrar/register.pl"
+ & Apt.installed ["kgb-client"]
+ & File.hasPrivContentExposed "/etc/kgb-bot/kgb-client.conf" anyContext
+ `requires` File.dirExists "/etc/kgb-bot/"
where
link = "/usr/lib/cgi-bin/register.cgi"