From c540f64f85aa77e8c6be7995546773739c3f0ba3 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 13 Mar 2012 16:04:44 +0000
Subject: [PATCH] split autoindex config to conf.d/autoindex.conf ship
 additional example configs in docdir

---
 .gitignore   |  1 +
 README.confd | 10 +++++-----
 httpd.spec   | 26 +++++++++++++++++++-------
 manual.conf  | 11 -----------
 4 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 manual.conf

diff --git a/.gitignore b/.gitignore
index c79cf2f..f6ef903 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ x86_64
 /httpd-2.2.21.tar.bz2
 /clog
 /httpd-2.2.22.tar.bz2
+/httpd-2.4.?
diff --git a/README.confd b/README.confd
index c12e149..63236e0 100644
--- a/README.confd
+++ b/README.confd
@@ -1,9 +1,9 @@
 
-This directory holds Apache 2.0 module-specific configuration files;
+This directory holds configuration files for the Apache HTTP Server;
 any files in this directory which have the ".conf" extension will be
-processed as Apache configuration files.
+processed as httpd configuration files.  The directory
+/etc/httpd/conf.modules.d/ contains configuration stubs which load
+modules.
 
-Files are processed in alphabetical order, so if using configuration
-directives which depend on, say, mod_perl being loaded, ensure that
-these are placed in a filename later in the sort order than "perl.conf".
+Files are processed in alphabetical order.
 
diff --git a/httpd.spec b/httpd.spec
index e450243..f7a4fa7 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -29,7 +29,6 @@ Source18: 00-ldap.conf
 Source19: userdir.conf
 Source20: ssl.conf
 Source21: welcome.conf
-Source22: manual.conf
 # Documentation
 Source33: README.confd
 # build/scripts patches
@@ -219,11 +218,20 @@ for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
 done
 
-for f in welcome.conf manual.conf ssl.conf userdir.conf; do
+for f in welcome.conf ssl.conf userdir.conf; do
   install -m 644 -p $RPM_SOURCE_DIR/$f \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f
 done
 
+# Split-out extra config shipped as default in conf.d:
+for f in manual autoindex; do
+  mv docs/conf/extra/httpd-${f}.conf \
+        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/${f}.conf
+done
+
+# Extra config trimmed:
+rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
+
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
 install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
@@ -241,9 +249,9 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav
 
 # Create cache directory
-mkdir $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
-      $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
-      $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/ssl
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
+         $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/proxy \
+         $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/ssl
 
 # Make the MMN accessible to module packages
 echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
@@ -414,6 +422,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
+%doc docs/conf/extra/*.conf
 
 %dir %{_sysconfdir}/httpd
 %{_sysconfdir}/httpd/modules
@@ -427,8 +436,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_sysconfdir}/httpd/conf.d
 %{_sysconfdir}/httpd/conf.d/README
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/userdir.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
+%exclude %{_sysconfdir}/httpd/conf.d/ssl.conf
+%exclude %{_sysconfdir}/httpd/conf.d/manual.conf
 
 %dir %{_sysconfdir}/httpd/conf.modules.d
 %config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/*.conf
@@ -510,6 +520,8 @@ rm -rf $RPM_BUILD_ROOT
 - default config:
  * unrestricted access to (only) /var/www
  * remove (commented) Mutex, MaxRanges, ScriptSock
+ * split autoindex config to conf.d/autoindex.conf
+- ship additional example configs in docdir
 
 * Tue Mar  6 2012 Joe Orton <jorton@redhat.com> - 2.4.1-1
 - update to 2.4.1
diff --git a/manual.conf b/manual.conf
deleted file mode 100644
index d09757d..0000000
--- a/manual.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This configuration file allows the manual to be accessed at 
-# http://localhost/manual/
-#
-AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/usr/share/httpd/manual$1"
-
-<Directory "/usr/share/httpd/manual">
-    Options Indexes
-    AllowOverride None
-    Require all granted
-</Directory>