From 29f2690d33325c70b932175a4bf67627f0370b3e Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 11 Dec 2016 14:20:19 +0100
Subject: [PATCH] Fix LocationMatch scope when using a dedicated vhost

---
 .../templates/etc/httpd/conf/httpd.conf/98LimeSurvey      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey
index 55ddf8f..8149d7d 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98LimeSurvey
@@ -11,8 +11,6 @@ my $auth = (($limesurvey{'Authentication'} || 'http') eq 'http') ? "AuthName \"L
 
 if ($limesurvey{'status'} eq 'enabled'){
 
-my $path = ($alias eq '') ? '' : 'limesurvey/';
-
 $OUT .=<<"END"
 
 # LimeSurvey Configuration
@@ -39,10 +37,14 @@ $alias
     allow from $allow
     Satisfy all
 </Directory>
-<LocationMatch "^/$path(index\.php/)?admin">
+if ($alias ne ''){
+    $OUT .=<<'_EOF';
+<LocationMatch "^/limesurvey/(index\.php/)?admin">
     SSLRequireSSL on
     $auth
 </LocationMatch>
+_EOF
+}
 <DirectoryMatch "/usr/share/limesurvey/(framework|console|installer/sql|locale|application/(logs|config)|docs)">
     Deny from all
 </DirectoryMatch>