commit 0b62ec022b3be2c527f903b16deff66c92fd563b
Author: Elan Ruusamäe <[email protected]>
Date: Sat May 2 20:25:26 2015 +0300
heartbeat module requires watchdog module
apache.spec | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 9c398b1..eae7c1b 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2860,7 +2860,8 @@ cp -p %{SOURCE29}
$RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
cp -p %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.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
}
@@ -2878,10 +2879,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 \
@@ -2889,12 +2891,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/ed9e6b2216e9b701461ecb12e9c5fadce8c92abb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
