summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--src/Propellor/Property/Ssh.hs5
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 8e9a2b48..90992e2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ propellor (0.7.1) UNRELEASED; urgency=medium
* Add --edit to edit a privdata value in $EDITOR.
* Add --list-fields to list a host's currently set privdata fields.
+ * Fix randomHostKeys property to run openssh-server's postinst in a
+ non-failing way.
-- Joey Hess <joeyh@debian.org> Thu, 19 Jun 2014 14:27:21 -0400
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 061f440c..3e354afe 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -72,9 +72,8 @@ randomHostKeys = flagFile prop "/etc/ssh/.unique_host_keys"
[ Param "-c"
, Param "rm -f /etc/ssh/ssh_host_*"
]
- ensureProperty $
- cmdProperty "/var/lib/dpkg/info/openssh-server.postinst"
- ["configure"]
+ ensureProperty $ scriptProperty
+ [ "DPKG_MAINTSCRIPT_PACKAGE=openssh-server /var/lib/dpkg/info/openssh-server.postinst configure" ]
-- | Sets ssh host keys from the site's PrivData.
--