From e9a09eed901fc8ff40c7debef02fb6b0ed48b165 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Jun 2016 14:00:32 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index a6cb3794..e3bef900 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -683,6 +683,8 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props & Apt.serviceInstalledRunning "mailman" & Postfix.service ssmtp + + & Apt.installed ["fetchmail"] where ctx = Context "kitenet.net" pinescript = "/usr/local/bin/pine" -- cgit v1.2.3 From 70e7a794a44e3d7fa3a0b3e019900d97ef415644 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Jun 2016 14:59:42 -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.2.3 From d78e99a1de865de277969f53d0ce45936deebdc3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Jun 2016 14:59:57 -0400 Subject: Switch letsencrypt to certbot package name. --- debian/changelog | 6 ++++++ src/Propellor/Property/LetsEncrypt.hs | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 763cecc6..fffc22cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (3.0.6) UNRELEASED; urgency=medium + + * Switch letsencrypt to certbot package name. + + -- Joey Hess Fri, 10 Jun 2016 14:59:44 -0400 + propellor (3.0.5) unstable; urgency=medium * Modules added for Sbuild and Ccache. diff --git a/src/Propellor/Property/LetsEncrypt.hs b/src/Propellor/Property/LetsEncrypt.hs index 592a1e1d..9e4898dd 100644 --- a/src/Propellor/Property/LetsEncrypt.hs +++ b/src/Propellor/Property/LetsEncrypt.hs @@ -8,10 +8,8 @@ import qualified Propellor.Property.Apt as Apt import System.Posix.Files --- Not using the certbot name yet, until it reaches jessie-backports and --- testing. installed :: Property DebianLike -installed = Apt.installed ["letsencrypt"] +installed = Apt.installed ["certbot"] -- | Tell the letsencrypt client that you agree with the Let's Encrypt -- Subscriber Agreement. Providing an email address is recommended, -- cgit v1.2.3