[packages/nagiosql] - migrated to apache 2.4

[baggins]

commit 20d5e618accca7e94d688a6ffb4ef2cdd6dabce5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 16 21:28:54 2013 +0200

    - migrated to apache 2.4

 nagiosql-httpd.conf |  9 +++++++++
 nagiosql.spec       | 10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/nagiosql.spec b/nagiosql.spec
index 3ff85e8..28ed20e 100644
--- a/nagiosql.spec
+++ b/nagiosql.spec
@@ -5,13 +5,14 @@
 Summary:	Web based administration tool for Nagios
 Name:		nagiosql
 Version:	3.0.4
-Release:	1
+Release:	2
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://dl.sourceforge.net/nagiosql/%{name}%{ver}.tar.bz2
 # Source0-md5:	32644a4ac38e94714d39af63456cb7a0
 Source1:	%{name}-apache.conf
 Source2:	%{name}.cfg
+Source3:	%{name}-httpd.conf
 Patch0:		%{name}-paths.patch
 URL:		http://www.nagiosql.org/
 Requires:	php(ftp)
@@ -21,6 +22,7 @@ Requires:	php(xml)
 Requires:	php-pear-HTML_Template_IT
 Requires:	webapps
 Requires:	webserver(php) >= 4.3
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,7 +52,7 @@ cp -a config $RPM_BUILD_ROOT%{_webconfdir}
 ln -sf %{_webconfdir}/config $RPM_BUILD_ROOT%{_appdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webconfdir}/httpd.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_webconfdir}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/nagios
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
@@ -59,10 +61,10 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/nagios
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %clean
diff --git a/nagiosql-httpd.conf b/nagiosql-httpd.conf
new file mode 100644
index 0000000..b83b2e9
--- /dev/null
+++ b/nagiosql-httpd.conf
@@ -0,0 +1,9 @@
+<IfModule mod_alias.c>
+	Alias /nagiosql /usr/share/nagiosql
+</IfModule>
+
+<Directory "/usr/share/nagiosql">
+	AllowOverride None
+	Require all granted
+	php_admin_value open_basedir "/etc/nagios:/etc/nagiosql:/etc/webapps/nagiosql/config:/usr/share/nagiosql:/usr/share/pear:/usr/sbin"
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagiosql.git/commitdiff/20d5e618accca7e94d688a6ffb4ef2cdd6dabce5