From 73a2dbcaf8a005e65ffb3f5cf0ffdb8493fa9318 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 6 Jun 2016 19:19:58 +0200 Subject: [PATCH] Always add letsencrypt alias so if a domain has letsencrypt support disabled, but has at least one hostname attached to this domain with letsencrypt enabled, it can validate its challenge --- .../etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt | 9 --------- .../etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt | 9 --------- 2 files changed, 18 deletions(-) diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt index 4a8d1ff..6478c43 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt @@ -1,13 +1,4 @@ -{ - if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){ - $OUT .=<<"_EOF"; Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/ Allow from all -_EOF - } - else{ - $OUT .= "# Support for Letsencrypt is disabled on this domain\n"; - } -} diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt index 4a8d1ff..6478c43 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt @@ -1,13 +1,4 @@ -{ - if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){ - $OUT .=<<"_EOF"; Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/ Allow from all -_EOF - } - else{ - $OUT .= "# Support for Letsencrypt is disabled on this domain\n"; - } -}