Fix LocationMatch scope when using a dedicated vhost
This commit is contained in:
parent
6fc63e7980
commit
29f2690d33
|
@ -11,8 +11,6 @@ my $auth = (($limesurvey{'Authentication'} || 'http') eq 'http') ? "AuthName \"L
|
||||||
|
|
||||||
if ($limesurvey{'status'} eq 'enabled'){
|
if ($limesurvey{'status'} eq 'enabled'){
|
||||||
|
|
||||||
my $path = ($alias eq '') ? '' : 'limesurvey/';
|
|
||||||
|
|
||||||
$OUT .=<<"END"
|
$OUT .=<<"END"
|
||||||
|
|
||||||
# LimeSurvey Configuration
|
# LimeSurvey Configuration
|
||||||
|
@ -39,10 +37,14 @@ $alias
|
||||||
allow from $allow
|
allow from $allow
|
||||||
Satisfy all
|
Satisfy all
|
||||||
</Directory>
|
</Directory>
|
||||||
<LocationMatch "^/$path(index\.php/)?admin">
|
if ($alias ne ''){
|
||||||
|
$OUT .=<<'_EOF';
|
||||||
|
<LocationMatch "^/limesurvey/(index\.php/)?admin">
|
||||||
SSLRequireSSL on
|
SSLRequireSSL on
|
||||||
$auth
|
$auth
|
||||||
</LocationMatch>
|
</LocationMatch>
|
||||||
|
_EOF
|
||||||
|
}
|
||||||
<DirectoryMatch "/usr/share/limesurvey/(framework|console|installer/sql|locale|application/(logs|config)|docs)">
|
<DirectoryMatch "/usr/share/limesurvey/(framework|console|installer/sql|locale|application/(logs|config)|docs)">
|
||||||
Deny from all
|
Deny from all
|
||||||
</DirectoryMatch>
|
</DirectoryMatch>
|
||||||
|
|
Loading…
Reference in New Issue