Compare commits

...

7 Commits

Author SHA1 Message Date
Daniel Berteaud 7b6cbbffac Spec file update 2017-01-04 09:57:08 +01:00
Daniel Berteaud 7399d228c6 Fix httpd template when alias is enabled 2017-01-04 09:54:01 +01:00
Daniel Berteaud 96457a300d Spec file update 2016-12-14 08:45:20 +01:00
Daniel Berteaud 6e9820bfd6 Missing semicolon 2016-12-11 21:02:43 +01:00
Daniel Berteaud 152c1d08f1 Fix httpd template error 2016-12-11 20:53:57 +01:00
Daniel Berteaud 29f2690d33 Fix LocationMatch scope when using a dedicated vhost 2016-12-11 14:20:19 +01:00
Daniel Berteaud 6fc63e7980 Spec file update 2016-12-11 14:18:23 +01:00
2 changed files with 27 additions and 8 deletions

View File

@ -11,9 +11,7 @@ my $auth = (($limesurvey{'Authentication'} || 'http') eq 'http') ? "AuthName \"L
if ($limesurvey{'status'} eq 'enabled'){
my $path = ($alias eq '') ? '' : 'limesurvey/';
$OUT .=<<"END"
$OUT .=<<"END";
# LimeSurvey Configuration
$alias
@ -39,15 +37,24 @@ $alias
allow from $allow
Satisfy all
</Directory>
<LocationMatch "^/$path(index\.php/)?admin">
END
if ($alias ne ''){
$OUT .=<<"END";
<LocationMatch "^/limesurvey/(index\.php/)?admin">
SSLRequireSSL on
$auth
</LocationMatch>
END
}
$OUT .=<<'END';
<DirectoryMatch "/usr/share/limesurvey/(framework|console|installer/sql|locale|application/(logs|config)|docs)">
Deny from all
</DirectoryMatch>
END
}
else{
$OUT .= "# LimeSurvey is disabled\n";

View File

@ -1,5 +1,5 @@
%define name smeserver-limesurvey
%define version 0.1.6
%define version 0.1.10
%define release 1
Summary: SME server integration of limesurvey
Name: %{name}
@ -22,6 +22,19 @@ AutoReqProv: no
Integration of LimeSurvey on SME Server
%changelog
* Wed Jan 4 2017 Daniel Berteaud <daniel@firewall-services.com> 0.1.10-1.sme
- Fix httpd template when alias is enabled
* Mon Dec 12 2016 Daniel Berteaud <daniel@firewall-services.com> 0.1.9-1.sme
- Fix syntax error introduced in previous commit
* Sun Dec 11 2016 Daniel Berteaud <daniel@firewall-services.com> 0.1.8-1.sme
- Fix LocationMatch scope when using a dedicated vhost
* Tue Apr 12 2016 Daniel Berteaud <daniel@firewall-services.com> 0.1.7-1.sme
- Always define hook_get_auth_webserver_profile function or profile
will fallback to the default one
* Wed Dec 23 2015 Daniel Berteaud <daniel@firewall-services.com> 0.1.6-1.sme
- Make sure hooks are declared just once
@ -57,12 +70,11 @@ rm -f %{name}-%{version}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
> %{name}-%{version}-filelist
%files -f %{name}-%{version}-filelist
%defattr(-,root,root)
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}-%{version}-filelist
%defattr(-,root,root)
%postun