89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
29 lines
936 B
Diff
29 lines
936 B
Diff
From b43460ecaeb7e332a993fb6ea19f4808d759711f Mon Sep 17 00:00:00 2001
|
|
From: Coty Sutherland <sutherland.coty@gmail.com>
|
|
Date: Thu, 28 May 2015 10:22:39 -0400
|
|
Subject: [PATCH] [apache] Added collection of conf.modules.d dir for httpd 2.4
|
|
|
|
Signed-off-by: Coty Sutherland <sutherland.coty@gmail.com>
|
|
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
|
|
---
|
|
sos/plugins/apache.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py
|
|
index dc700cb..551b062 100644
|
|
--- a/sos/plugins/apache.py
|
|
+++ b/sos/plugins/apache.py
|
|
@@ -34,7 +34,8 @@ class RedHatApache(Apache, RedHatPlugin):
|
|
|
|
self.add_copy_spec([
|
|
"/etc/httpd/conf/httpd.conf",
|
|
- "/etc/httpd/conf.d/*.conf"
|
|
+ "/etc/httpd/conf.d/*.conf",
|
|
+ "/etc/httpd/conf.modules.d/*.conf"
|
|
])
|
|
|
|
self.add_forbidden_path("/etc/httpd/conf/password.conf")
|
|
--
|
|
1.8.3.1
|
|
|