summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/LetsEncrypt.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 4 insertions, 1 deletions
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"