Make it works with both SME8 and SME9
And fix HTTP auth when not using LemonLDAP::NG
This commit is contained in:
parent
9dbd10f2dd
commit
c178946437
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
my $access = $limesurvey{'access'} || 'private';
|
||||
my $allow = ($access eq 'public')?'all':"$localAccess $externalSSLAccess";
|
||||
|
||||
my $allow = ($access eq 'public') ? 'all' : "$localAccess $externalSSLAccess";
|
||||
my $alias = (($limesurvey{'AliasOnPrimary'} || 'enabled') ne 'enabled') ?
|
||||
'':'Alias /limesurvey /usr/share/limesurvey';
|
||||
'' : 'Alias /limesurvey /usr/share/limesurvey';
|
||||
my $ver = $sysconfig{'ReleaseVersion'} || '8.1';
|
||||
my $auth = (($limesurvey{'Authentication'} || 'http') eq 'http') ? "AuthName \"LimeSurvey\"\n" .
|
||||
" AuthType Basic\n" .
|
||||
" AuthExternal pwauth\n" .
|
||||
" AuthExternal pwauth\n" . (($ver =~ m/^9/) ? " AuthBasicProvider external\n":'') .
|
||||
" Require valid-user\n" : '';
|
||||
|
||||
if ($limesurvey{'status'} eq 'enabled'){
|
||||
|
@ -37,10 +37,10 @@ $alias
|
|||
allow from $allow
|
||||
Satisfy all
|
||||
</Directory>
|
||||
<Directory /usr/share/limesurvey/admin>
|
||||
<LocationMatch "^/{ ($alias eq '') ? '' : 'limesurvey/' }(index\.php/)?admin">
|
||||
SSLRequireSSL on
|
||||
$auth
|
||||
</Directory>
|
||||
</LocationMatch>
|
||||
<DirectoryMatch "/usr/share/limesurvey/(framework|console|installer/sql|locale|application/(logs|config)|docs)">
|
||||
Deny from all
|
||||
</DirectoryMatch>
|
||||
|
|
|
@ -7,6 +7,6 @@ if (($port ne $sslport) && ($status eq 'enabled') && ($alias eq 'enabled')){
|
|||
|
||||
## Redirect Web Address to Secure Address
|
||||
$OUT .= " RewriteRule ^/limesurvey/admin(/.*|\$) https://%{HTTP_HOST}/limesurvey/admin\$1 \[L,R\]\n";
|
||||
|
||||
$OUT .= " RewriteRule ^/limesurvey/index.php/admin(/.*|\$) https://%{HTTP_HOST}/limesurvey/index.php/admin\$1 \[L,R\]\n";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue