[packages/apache/feat/conf-modules: 24/26] heartbeat module requires watchdog module

[glen]

commit 7d25b10976296ab35ca92004600a3c849eba801d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 2 20:25:26 2015 +0300

    heartbeat module requires watchdog module

 apache.spec | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index b7afadf..e1e7bce 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.8
+Release:	3.9
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -2808,7 +2808,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 conffile=${3:-$module}
+	local index=$1 module=$2 conffile
+	conffile=${3:-$module}
 	echo "LoadModule ${module}_module modules/mod_$module.so" >> $CONFD_MODULES/$index-mod_$conffile.conf
 }
 
@@ -2826,10 +2827,11 @@ for module in access_compat actions alias allowmethods asis auth_basic \
 	data dbd dialup dumpio \
 	echo env expires dav ext_filter \
 	file_cache filter \
-	headers heartbeat heartmonitor \
+	headers \
+	heartmonitor \
+	lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic lbmethod_heartbeat \
 	ident imagemap include \
-	lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic \
-	lbmethod_heartbeat ldap log_debug log_forensic logio lua \
+	ldap log_debug log_forensic logio lua \
 	macro negotiation \
 	ratelimit reflector remoteip reqtimeout request rewrite \
 	sed session_cookie session_crypto session_dbd session setenvif \
@@ -2837,12 +2839,15 @@ for module in access_compat actions alias allowmethods asis auth_basic \
 	socache_shmcb ssl speling substitute \
 	unique_id usertrack version watchdog xml2enc \
 ; do
-	LoadModule 05 $module
+	LoadModule 01 $module
 done
 
 # append these to dav config
-LoadModule 05 dav_fs dav
-LoadModule 05 dav_lock dav
+LoadModule 01 dav_fs dav
+LoadModule 01 dav_lock dav
+
+# heartbeat requires watchdog
+LoadModule 02 heartbeat
 
 # anything in style dir not ending with .css is trash
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
================================================================

---- gitweb:

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