summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Base.hs2
-rw-r--r--src/Propellor/Property/LetsEncrypt.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs2
-rw-r--r--src/Propellor/Types/ZFS.hs1
4 files changed, 5 insertions, 1 deletions
diff --git a/src/Propellor/Base.hs b/src/Propellor/Base.hs
index 2a0f5cbc..ef75bf03 100644
--- a/src/Propellor/Base.hs
+++ b/src/Propellor/Base.hs
@@ -47,7 +47,7 @@ import Propellor.PropAccum
import Propellor.Location
import Propellor.Utilities
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.IO
import System.FilePath
import Data.Maybe
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 ->
diff --git a/src/Propellor/Types/ZFS.hs b/src/Propellor/Types/ZFS.hs
index 8784c641..3ce4b22c 100644
--- a/src/Propellor/Types/ZFS.hs
+++ b/src/Propellor/Types/ZFS.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE ConstrainedClassMethods #-}
-- | Types for ZFS Properties.
--
-- Copyright 2016 Evan Cofsky <evan@theunixman.com>