From e2bd3ece23976240c56dd522f04b5e6f4211828e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 7 Feb 2016 19:53:12 -0400 Subject: propellor spin --- src/Propellor/Property/Apache.hs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/Propellor/Property/Apache.hs') diff --git a/src/Propellor/Property/Apache.hs b/src/Propellor/Property/Apache.hs index 38d47b94..c2c32a3b 100644 --- a/src/Propellor/Property/Apache.hs +++ b/src/Propellor/Property/Apache.hs @@ -179,20 +179,23 @@ httpsVirtualHost' domain docroot letos addedcfg = setup -- Everything else redirects to https , "RewriteRule ^/(.*) https://" ++ domain ++ "/$1 [L,R,NE]" ] - certinstaller _domain certfile privkeyfile chainfile _fullchainfile = + certinstaller :: LetsEncrypt.CertInstaller + certinstaller newcert _domain certfile privkeyfile chainfile _fullchainfile = combineProperties (domain ++ " ssl cert installed") [ File.dirExists (takeDirectory cf) - , File.hasContent cf $ vhost (Port 443) - [ "SSLEngine on" - , "SSLCertificateFile " ++ certfile - , "SSLCertificateKeyFile " ++ privkeyfile - , "SSLCertificateChainFile " ++ chainfile - ] - -- always reload; the cert has changed - , reloaded + , File.hasContent cf sslvhost + `onChange` reloaded + -- always reload when the cert has changed + , check (return newcert :: IO Bool) reloaded ] where cf = sslconffile "letsencrypt" + sslvhost = vhost (Port 443) + [ "SSLEngine on" + , "SSLCertificateFile " ++ certfile + , "SSLCertificateKeyFile " ++ privkeyfile + , "SSLCertificateChainFile " ++ chainfile + ] sslconffile s = "/etc/apache2/sites-available/ssl/" ++ domain ++ "/" ++ s ++ ".conf" vhost (Port p) ls = [ "" -- cgit v1.3-2-g0d8e