From 7bd2411a374b07f3863347b5b30c8f22e4c95ba0 Mon Sep 17 00:00:00 2001
From: Daniel Steiner <dsteiner@redhat.com>
Date: Wed, 14 Mar 2018 20:01:06 +0100
Subject: [PATCH] status and info config added

---
 centos/SPECS/httpd.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/centos/SPECS/httpd.spec b/centos/SPECS/httpd.spec
index 80b8536..36cf7d0 100644
--- a/centos/SPECS/httpd.spec
+++ b/centos/SPECS/httpd.spec
@@ -8,7 +8,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.29
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -38,11 +38,13 @@ Source25: 01-session.conf
 Source26: 10-listen443.conf
 Source27: httpd.socket
 Source28: 00-optional.conf
+Source29: vhosts.conf
 # Documentation
 Source30: README.confd
 Source31: README.confmod
 Source40: htcacheclean.service
 Source41: htcacheclean.sysconf
+Source42: status-info.conf
 # build/scripts patches
 Patch1: httpd-2.4.1-apctl.patch
 Patch2: httpd-2.4.9-apxs.patch
@@ -295,7 +297,10 @@ done
 
 # install conf file/directory
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
-      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
+      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d \
+      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/vhosts.d
+install -m 644 %{S:42} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/status-info.conf
+install -m 644 %{S:29} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/00-vhosts.conf
 install -m 644 $RPM_SOURCE_DIR/README.confd \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
 install -m 644 $RPM_SOURCE_DIR/README.confmod \
@@ -569,6 +574,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_sysconfdir}/httpd/conf.d/manual.conf
 
 %dir %{_sysconfdir}/httpd/conf.modules.d
+%dir %{_sysconfdir}/httpd/vhosts.d
 %{_sysconfdir}/httpd/conf.modules.d/README
 %config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/*.conf
 %exclude %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
@@ -681,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Wed Mar 14 2018 Daniel Steiner <dsteiner@redhat.com> - 2.4.29-2
+- status-info.conf added.
+
 * Tue Feb 13 2018 Daniel Steiner <dsteiner@redhat.com> - 2.4.29-1
 - new version 2.4.29