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. --- debian/changelog | 6 ++++++ src/Propellor/Property/LetsEncrypt.hs | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6f6f2884..fcad255e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (3.0.4) UNRELEASED; urgency=medium + + * Run letsencrypt with --noninteractive. + + -- Joey Hess Thu, 05 May 2016 10:37:43 -0400 + propellor (3.0.3) unstable; urgency=medium * Remove Propellor.DotDir from the propellor library, as its use of 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 0414ecb529b4b73547bfd753ce5b810cfe0f59d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 May 2016 10:38:01 -0400 Subject: setting up joeyconfig after merge --- config.hs | 2 +- privdata/relocate | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index ec313725..97d90636 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -config-simple.hs \ No newline at end of file +joeyconfig.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig -- cgit v1.3-2-g0d8e -- cgit v1.3-2-g0d8e -- 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(+) 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(-) 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 From 2ec29c2f6c9ea149411d360f01147f4935910705 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 7 May 2016 00:27:05 -0400 Subject: changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index fcad255e..43931aae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ propellor (3.0.4) UNRELEASED; urgency=medium * Run letsencrypt with --noninteractive. + * Fix build with ghc 8.0.1-rc4. + Thanks, davean. -- Joey Hess Thu, 05 May 2016 10:37:43 -0400 -- cgit v1.3-2-g0d8e From fc75b2b9ab929f921512dafe69465106f497ad20 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 May 2016 12:05:45 -0400 Subject: correct license --- propellor.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/propellor.cabal b/propellor.cabal index e931e3df..806950b9 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,7 +1,7 @@ Name: propellor Version: 3.0.3 Cabal-Version: >= 1.8 -License: BSD3 +License: BSD2 Maintainer: Joey Hess Author: Joey Hess Stability: Stable -- cgit v1.3-2-g0d8e