[packages/pykota] - migrated to apache 2.4

[baggins]

commit 83341117297e12d3ce19f0dad25f19a63793e5a4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 16 22:09:40 2013 +0200

    - migrated to apache 2.4

 pykota-apache.conf | 31 +++++++++++++++++++++++++++++++
 pykota-httpd.conf  |  3 +--
 pykota.spec        | 12 +++++++-----
 3 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/pykota.spec b/pykota.spec
index 349a444..4ce0a5d 100644
--- a/pykota.spec
+++ b/pykota.spec
@@ -11,14 +11,15 @@ Summary:	Print Quota and Accounting Software Solution
 Summary(pl.UTF-8):	Narzędzie do limitowania i rozliczania wydruków
 Name:		pykota
 Version:	1.26
-Release:	8
+Release:	9
 License:	GPL v2
 Group:		Applications/Printing
 # NOTE: from svn:
 # svn co svn://svn.librelogiciel.com/pykota/tags/1.26/
 Source0:	%{name}-%{version}.tar.bz2
 # Source0-md5:	6e4b3232420592695388cbb27511e668
-Source1:	%{name}-httpd.conf
+Source1:	%{name}-apache.conf
+Source2:	%{name}-httpd.conf
 Patch0:		%{name}-conf.patch
 Patch1:		%{name}-css.patch
 URL:		http://www.pykota.com/
@@ -86,6 +87,7 @@ Requires:	webapps
 Requires:	webserver
 Requires:	webserver(access)
 Requires:	webserver(cgi)
+Conflicts:	apache-base < 2.4.0-1
 
 %description cgi
 CGI interface for pykota.
@@ -207,8 +209,8 @@ install initscripts/ldap/pykota.schema $RPM_BUILD_ROOT%{schemadir}
 install conf/pykota.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pykota.conf
 install conf/pykotadmin.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pykotadmin.conf
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 
 ln -s %{_datadir}/%{name}/cupspykota $RPM_BUILD_ROOT%{cups_serverbin}/backend/cupspykota
 
@@ -237,10 +239,10 @@ fi
 %triggerun cgi -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin cgi -- apache < 2.2.0, apache-base
+%triggerin cgi -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun cgi -- apache < 2.2.0, apache-base
+%triggerun cgi -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %post -n openldap-schema-pykota
diff --git a/pykota-apache.conf b/pykota-apache.conf
new file mode 100644
index 0000000..522b673
--- /dev/null
+++ b/pykota-apache.conf
@@ -0,0 +1,31 @@
+#
+# PyKota CGI scripts must be run as user pykota
+#
+# An example virtual host with proper settings for suexec
+
+#Listen 8631
+
+#<VirtualHost _default_:8631>
+#	DocumentRoot /home/services/httpd/cgi-bin/pykota/
+#	ServerName localhost
+#	SuExecUserGroup pykota pykota
+#</VirtualHost>
+
+<Directory /home/services/httpd/cgi-bin/pykota/>
+	Options ExecCGI
+	AllowOverride None
+	AddHandler cgi-script .cgi
+
+# To get full functionality protect access with user/pass
+# An example here is how to do this with mod_auth_pam
+#
+#	AuthPAM_Enabled on
+#	AuthPAM_FallThrough off
+#	AuthBasicAuthoritative off
+#	AuthType Basic
+#	AuthName "PyKota tools"
+#	Require valid-user
+
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/pykota-httpd.conf b/pykota-httpd.conf
index 522b673..e20537f 100644
--- a/pykota-httpd.conf
+++ b/pykota-httpd.conf
@@ -26,6 +26,5 @@
 #	AuthName "PyKota tools"
 #	Require valid-user
 
-	Order allow,deny
-	Allow from all
+	Require all granted
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pykota.git/commitdiff/83341117297e12d3ce19f0dad25f19a63793e5a4