From 046fa02522cd62c19fa446b3d859c44149a8840e Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sat, 23 Jan 2016 14:52:29 +0100
Subject: [PATCH] Don't rewrite to https for acme challenges

---
 .../etc/httpd/conf/httpd.conf/LemonLDAPManager/80LemonLDAPManager        | 1 +
 .../etc/httpd/conf/httpd.conf/LemonLDAPPortal/80LemonLDAPPortal          | 1 +
 .../templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80LemonLDAPSoap    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80LemonLDAPManager b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80LemonLDAPManager
index 8ec7268..316abce 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80LemonLDAPManager
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80LemonLDAPManager
@@ -10,6 +10,7 @@
     #====================================================================
 
     RewriteEngine on
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
     RewriteRule ^/(.*|\$) https://%{HTTP_HOST}/\$1 \[L,R\]
 EOF
     }
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80LemonLDAPPortal b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80LemonLDAPPortal
index 27201e2..f460246 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80LemonLDAPPortal
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80LemonLDAPPortal
@@ -11,6 +11,7 @@ if ( $port ne ($modSSL{'TCPPort'} || '443')){
     #====================================================================
 
     RewriteEngine on
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
     RewriteRule ^/(.*|\$) https://%{HTTP_HOST}/\$1 \[L,R\]
 
 EOF
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80LemonLDAPSoap b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80LemonLDAPSoap
index d4d27c3..db48acd 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80LemonLDAPSoap
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80LemonLDAPSoap
@@ -11,6 +11,7 @@ if ( $port ne ($modSSL{'TCPPort'} || '443')){
     #====================================================================
 
     RewriteEngine on
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
     RewriteRule ^/(.*|\$) https://%{HTTP_HOST}/\$1 \[L,R\]
 
 EOF