[packages/apache/feat/conf-modules: 22/26] loadmodule for dav and ssl

[glen]

commit 0352d06ed54ae255aaee185ee44ea1630b80d6be
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 2 16:50:50 2015 +0300

    loadmodule for dav and ssl

 apache-mod_dav.conf |  4 ----
 apache-mod_ssl.conf |  2 --
 apache.spec         | 16 +++++++++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index d2b03d7..7f715f1 100644
--- a/apache.spec
+++ b/apache.spec
@@ -33,7 +33,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.12
-Release:	3.1
+Release:	3.4
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -2807,8 +2807,8 @@ cp -p %{SOURCE22} $CONFD/languages.conf
 cp -p %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
 
 LoadModule() {
-	local index=$1 module=$2
-	echo "LoadModule ${module}_module modules/mod_$module.so" > $CONFD_MODULES/$index-mod_$module.conf
+	local index=$1 module=$2 conffile=${3:-$module}
+	echo "LoadModule ${module}_module modules/mod_$module.so" >> $CONFD_MODULES/$index-mod_$conffile.conf
 }
 
 for module in access_compat actions alias allowmethods asis auth_basic \
@@ -2820,7 +2820,7 @@ for module in access_compat actions alias allowmethods asis auth_basic \
 	%{?with_bucketeer:bucketeer} \
 	case_filter_in case_filter cern_meta cgi charset_lite \
 	data dbd dialup dumpio \
-	echo env expires ext_filter \
+	echo env expires dav ext_filter \
 	file_cache filter \
 	headers heartbeat heartmonitor \
 	ident imagemap include \
@@ -2830,12 +2830,16 @@ for module in access_compat actions alias allowmethods asis auth_basic \
 	ratelimit reflector remoteip reqtimeout request rewrite \
 	sed session_cookie session_crypto session_dbd session setenvif \
 	slotmem_plain slotmem_shm socache_dbm socache_memcache \
-	socache_shmcb speling substitute \
+	socache_shmcb ssl speling substitute \
 	unique_id usertrack version watchdog xml2enc \
 ; do
 	LoadModule 00 $module
 done
 
+# append these to dav config
+LoadModule 00 dav_fs dav
+LoadModule 00 dav_lock dav
+
 # anything in style dir not ending with .css is trash
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
 find $RPM_BUILD_ROOT%{_datadir}/manual/style -type f ! -name '*.css' -print0 | xargs -0r rm -f
@@ -3410,6 +3414,7 @@ fi
 
 %files mod_dav
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_dav.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_dav.conf
 %attr(755,root,root) %{_libexecdir}/mod_dav*.so
 %dir %attr(770,root,http) /var/lock/mod_dav
@@ -3698,6 +3703,7 @@ fi
 %defattr(644,root,root,755)
 %attr(750,root,root) %dir %{_sysconfdir}/ssl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ssl/server.*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.modules.d/*mod_ssl.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ssl.conf
 %attr(755,root,root) %{_libexecdir}/mod_ssl.so
 %endif
diff --git a/apache-mod_dav.conf b/apache-mod_dav.conf
index 46b3f4c..983ea2c 100644
--- a/apache-mod_dav.conf
+++ b/apache-mod_dav.conf
@@ -1,7 +1,3 @@
-LoadModule dav_module		modules/mod_dav.so
-LoadModule dav_fs_module	modules/mod_dav_fs.so
-LoadModule dav_lock_module	modules/mod_dav_lock.so
-
 #
 # Distributed authoring and versioning (WebDAV)
 #
diff --git a/apache-mod_ssl.conf b/apache-mod_ssl.conf
index a9062f4..cee8acf 100644
--- a/apache-mod_ssl.conf
+++ b/apache-mod_ssl.conf
@@ -1,5 +1,3 @@
-LoadModule ssl_module	modules/mod_ssl.so
-
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a310d9961edb669ed8e5898368a88f47e282311b