Attachment 943016 Details for Bug 1148375 – Patch applicable to upstream sos

[patch] Patch applicable to upstream sos

bz1148375_upstream.patch (text/plain), 1.08 KB, created by Pavel Moravec on 2014-10-01 11:06:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2014-10-01 11:06:48 UTC

Size: 1.08 KB

patch

obsolete

>diff --git a/./sos/sos/plugins/tomcat.py b/./sos_new/sos/plugins/tomcat.py
>index e048aae..0ae2463 100644
>--- a/./sos/sos/plugins/tomcat.py
>+++ b/./sos_new/sos/plugins/tomcat.py
>@@ -22,19 +22,22 @@ class Tomcat(Plugin, RedHatPlugin):
>     plugin_name = 'tomcat'
>     profiles = ('webserver', 'java', 'services')
> 
>-    packages = ('tomcat6',)
>+    packages = ('tomcat6', 'tomcat',)
> 
>     def setup(self):
>         self.add_copy_specs([
>             "/etc/tomcat6",
>-            "/var/log/tomcat6/catalina.out"
>+            "/var/log/tomcat6/catalina.out",
>+            "/etc/tomcat",
>+            "/var/log/tomcat/catalina.out"
>         ])
> 
>     def postproc(self):
>-        self.do_file_sub(
>-            "/etc/tomcat6/tomcat-users.xml",
>-            r"password=(\S*)",
>-            r'password="********"'
>-        )
>+        for tomcat_users_file in ("/etc/tomcat6/tomcat-users.xml", "/etc/tomcat/tomcat-users.xml"):
>+            self.do_file_sub(
>+                tomcat_users_file,
>+                r"password=(\S*)",
>+                r'password="********"'
>+            )
> 
> # vim: et ts=4 sw=4

Actions: View | Diff

Attachments on bug 1148375: 943015 | 943016 | 947808