summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--debian/changelog8
-rw-r--r--privdata/relocate1
-rw-r--r--propellor.cabal2
-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
8 files changed, 16 insertions, 3 deletions
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/debian/changelog b/debian/changelog
index 6f6f2884..43931aae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (3.0.4) UNRELEASED; urgency=medium
+
+ * Run letsencrypt with --noninteractive.
+ * Fix build with ghc 8.0.1-rc4.
+ Thanks, davean.
+
+ -- Joey Hess <id@joeyh.name> 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/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig
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 <id@joeyh.name>
Author: Joey Hess
Stability: Stable
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>