summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2016-07-07 19:29:00 +0100
committerJoe Orton <jorton@redhat.com>2016-07-07 19:29:00 +0100
commit17ef1b1f5e024cc8f40f23345fd0ce589e78d8f6 (patch)
treeb795a33bee28c64ac541d54ef34d6fc34a793318
parent53f8164b15d222388a1ce249d3935d8d11b26e40 (diff)
load mod_watchdog by default (#1353582)
Resolves: rhbz#1325883 Resolves: rhbz#1353582
-rw-r--r--00-base.conf1
-rw-r--r--00-optional.conf1
-rw-r--r--httpd.spec5
3 files changed, 5 insertions, 2 deletions
diff --git a/00-base.conf b/00-base.conf
index c109de6..e99ff0e 100644
--- a/00-base.conf
+++ b/00-base.conf
@@ -64,4 +64,5 @@ LoadModule unixd_module modules/mod_unixd.so
LoadModule userdir_module modules/mod_userdir.so
LoadModule version_module modules/mod_version.so
LoadModule vhost_alias_module modules/mod_vhost_alias.so
+LoadModule watchdog_module modules/mod_watchdog.so
diff --git a/00-optional.conf b/00-optional.conf
index 2d7ce8e..ef584ec 100644
--- a/00-optional.conf
+++ b/00-optional.conf
@@ -5,7 +5,6 @@
#LoadModule asis_module modules/mod_asis.so
#LoadModule buffer_module modules/mod_buffer.so
-#LoadModule watchdog_module modules/mod_watchdog.so
#LoadModule heartbeat_module modules/mod_heartbeat.so
#LoadModule heartmonitor_module modules/mod_heartmonitor.so
#LoadModule usertrack_module modules/mod_usertrack.so
diff --git a/httpd.spec b/httpd.spec
index 49f5c96..3b9533b 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.23
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -682,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-3
+- load mod_watchdog by default (#1353582)
+
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-2
- restore build of mod_proxy_fdpass (#1325883)
- improve check tests to catch configured-but-not-built modules