[packages/nagios-naglite] Revert "- migrated to apache 2.4"

[glen]

commit 2ead91866b70bdf621cca640f80388fb122e2508
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 6 18:05:09 2015 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 931f8f4dc022a573eb485c22605c30e3dbf7ee65.

 httpd.conf          | 21 ---------------------
 nagios-naglite.spec |  8 +++-----
 2 files changed, 3 insertions(+), 26 deletions(-)
---
diff --git a/nagios-naglite.spec b/nagios-naglite.spec
index b1f7eb0..36304ce 100644
--- a/nagios-naglite.spec
+++ b/nagios-naglite.spec
@@ -11,7 +11,6 @@ Source0:	https://github.com/saz/Naglite3/tarball/master/%{pname}-%{version}.tgz
 # Source0-md5:	5f75248d14eb6c9bd2e925729868cbc4
 Source1:	apache.conf
 Source2:	lighttpd.conf
-Source3:	httpd.conf
 Patch0:		paths.patch
 URL:		https://github.com/saz/Naglite3
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
@@ -22,7 +21,6 @@ Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires:	webserver(php)
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,7 +48,7 @@ ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,10 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerin -- apache1 < 1.3.37-3, apache1-base >= 1.3.37-3
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index ff98a8a..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-Alias /naglite /usr/share/naglite
-
-<Directory /usr/share/naglite>
-	# WITHOUT SSL
-	<IfModule !mod_ssl.c>
-		Require all denied
-		Require local
-	</IfModule>
-
-	# WITH SSL ENABLED
-	<IfModule mod_ssl.c>
-		SSLRequireSSL
-
-		Require all granted
-		AuthType Basic
-		AuthUserFile /etc/webapps/nagios/passwd
-		AuthGroupFile /etc/webapps/nagios/group
-		AuthName "Nagios"
-		Require group nagios
-	</IfModule>
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-naglite.git/commitdiff/e375cd74fd1f1f1f4650cb5811920d1e36e02928