summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2016-05-10 12:07:17 -0400
committerJoey Hess2016-05-10 12:07:17 -0400
commitc0b38a56ec9bdd85900fca3c040de85ef814bc1d (patch)
treec94269dad28df73698d6593d2462f84892092f54 /src/Propellor/Property
parente4d412261c56696ab680bf607e3b7ca6182a0757 (diff)
parentfc75b2b9ab929f921512dafe69465106f497ad20 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/LetsEncrypt.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/Propellor/Property/LetsEncrypt.hs b/src/Propellor/Property/LetsEncrypt.hs
index bf38046b..88d4f5a8 100644
--- a/src/Propellor/Property/LetsEncrypt.hs
+++ b/src/Propellor/Property/LetsEncrypt.hs
@@ -74,6 +74,7 @@ letsEncrypt' (AgreeTOS memail) domain domains webroot =
, "--webroot"
, "--webroot-path", webroot
, "--text"
+ , "--noninteractive"
, "--keep-until-expiring"
] ++ map (\d -> "--domain="++d) alldomains
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index ce89b94a..b4812c7e 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -135,6 +135,8 @@ stackAutoBuilder suite arch flavor =
& User.accountFor (User builduser)
& tree arch flavor
& stackInstalled
+ -- Workaround https://github.com/commercialhaskell/stack/issues/2093
+ & Apt.installed ["libtinfo-dev"]
stackInstalled :: Property Linux
stackInstalled = withOS "stack installed" $ \w o ->