summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--doc/forum/Certbot_cert_expanding/comment_2_2a16c69729cff4262c9a37b264c60ae0._comment7
-rw-r--r--doc/forum/mailname_set_by_Propellor.Property.Hostname.sane/comment_2_d82e10087205a4b2896e4fd07032643d._comment9
-rw-r--r--src/Propellor/Property/LetsEncrypt.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
5 files changed, 26 insertions, 1 deletions
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 <id@joeyh.name> 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/doc/forum/mailname_set_by_Propellor.Property.Hostname.sane/comment_2_d82e10087205a4b2896e4fd07032643d._comment b/doc/forum/mailname_set_by_Propellor.Property.Hostname.sane/comment_2_d82e10087205a4b2896e4fd07032643d._comment
new file mode 100644
index 00000000..24c0efcf
--- /dev/null
+++ b/doc/forum/mailname_set_by_Propellor.Property.Hostname.sane/comment_2_d82e10087205a4b2896e4fd07032643d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2018-08-10T14:56:07Z"
+ content="""
+I have probably generalized too much from my own use case then, where
+I always have foo.example.com as the full hostname, but want mail to be
+sent with example.com as the name.
+"""]]
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
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 93408dfa..4d7b7b9c 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1140,7 +1140,7 @@ laptopSoftware = Apt.installed
, "mpc", "mpd", "ncmpc", "sonata", "mpdtoys"
, "bsdgames", "nethack-console"
, "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev"
- , "ttf-bitstream-vera"
+ , "ttf-bitstream-vera", "fonts-symbola", "fonts-noto-color-emoji"
, "mairix", "offlineimap", "mutt", "slrn"
, "mtr", "nmap", "whois", "wireshark", "tcpdump", "iftop"
, "pmount", "tree", "pv"