From 88890c22fde1d5e4f9cb3f9336a6aacd64d69c6b Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 24 Jan 2016 17:35:01 +0100
Subject: [PATCH] Change challenge directory

---
 .../templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir       | 2 +-
 .../e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt  | 2 +-
 .../templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt  | 2 +-
 .../templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt   | 2 +-
 .../templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt     | 2 +-
 .../etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt      | 2 +-
 .../templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt      | 2 +-
 .../templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt | 2 +-
 root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir
index fab0b1d..9d47da7 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir
@@ -2,7 +2,7 @@
   if (($letsencrypt{'status'} || 'disabled') eq 'enabled'){
     $OUT .=<<"_EOF";
 
-<Directory /var/lib/letsencrypt.sh>
+<Directory /var/lib/letsencrypt.sh/challenges>
     Options None
     AllowOverride None
     Order deny,allow
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt
index b246f24..4a8d1ff 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt
@@ -1,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt
index b246f24..4a8d1ff 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt
@@ -1,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt
index b246f24..4a8d1ff 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt
@@ -1,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt
index b246f24..4a8d1ff 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt
@@ -1,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt
index b246f24..4a8d1ff 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt
@@ -1,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
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 b246f24..4a8d1ff 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,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
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 b246f24..4a8d1ff 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,7 +1,7 @@
 {
   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/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
     <Location /.well-known/acme-challenge/>
       Allow from all
     </Location>
diff --git a/root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown b/root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown
index fc1bb36..97d1c6b 100644
--- a/root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown
+++ b/root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown
@@ -1 +1 @@
-WELLKNOWN=/var/lib/letsencrypt.sh/
+WELLKNOWN=/var/lib/letsencrypt.sh/challenges