From 4ab35dfdab08941a96678b94096832887c10f347 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Aug 2018 10:57:41 -0400 Subject: letsencrypt': Pass --expand to support expanding the list of domains --- debian/changelog | 6 ++++++ .../comment_2_2a16c69729cff4262c9a37b264c60ae0._comment | 7 +++++++ src/Propellor/Property/LetsEncrypt.hs | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 doc/forum/Certbot_cert_expanding/comment_2_2a16c69729cff4262c9a37b264c60ae0._comment diff --git a/debian/changelog b/debian/changelog index 171cd8fe..1da97c15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (5.4.2) UNRELEASED; urgency=medium + + * letsencrypt': Pass --expand to support expanding the list of domains + + -- Joey Hess Thu, 09 Aug 2018 10:54:41 -0400 + propellor (5.4.1) unstable; urgency=medium * Modernized and simplified the MetaTypes implementation now that diff --git a/doc/forum/Certbot_cert_expanding/comment_2_2a16c69729cff4262c9a37b264c60ae0._comment b/doc/forum/Certbot_cert_expanding/comment_2_2a16c69729cff4262c9a37b264c60ae0._comment new file mode 100644 index 00000000..8aba068a --- /dev/null +++ b/doc/forum/Certbot_cert_expanding/comment_2_2a16c69729cff4262c9a37b264c60ae0._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2018-08-09T14:55:33Z" + content=""" +Ok, patched it in. +"""]] diff --git a/src/Propellor/Property/LetsEncrypt.hs b/src/Propellor/Property/LetsEncrypt.hs index 9e4898dd..99c23715 100644 --- a/src/Propellor/Property/LetsEncrypt.hs +++ b/src/Propellor/Property/LetsEncrypt.hs @@ -77,6 +77,9 @@ letsEncrypt' (AgreeTOS memail) domain domains webroot = , "--text" , "--noninteractive" , "--keep-until-expiring" + -- The list of domains may be changed, adding more, so + -- always request expansion. + , "--expand" ] ++ map (\d -> "--domain="++d) alldomains getstats = mapM statcertfiles alldomains -- cgit v1.2.3