From 1e12a3a8c4fd0a5b027ff7923bb014b7836f8fd9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 May 2016 10:37:57 -0400 Subject: Run letsencrypt with --noninteractive. --- src/Propellor/Property/LetsEncrypt.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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 -- cgit v1.3-2-g0d8e From 5cb6ddd9a9dc73bb514ebfdd86b0026e7ad97770 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 May 2016 15:44:05 -0400 Subject: workaround --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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 -> -- cgit v1.3-2-g0d8e From f815316301ef176c980deed3a89ab58e6a18efff Mon Sep 17 00:00:00 2001 From: davean Date: Fri, 6 May 2016 21:17:08 -0400 Subject: Compiling propellor on GHC 8.0.1-rc4 ConstrainedClassMethods was added in GHC 7.6.1.3 so I think its sufficiently backwards compatible for you? --- src/Propellor/Base.hs | 2 +- src/Propellor/Types/ZFS.hs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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/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 -- cgit v1.3-2-g0d8e