Attachment 916078 Details for Bug 1039755 – patch openshift.py to reduce glob based collection, obfuscate pwd

[patch] patch openshift.py to reduce glob based collection, obfuscate pwd

openshift.patch (text/plain), 1.70 KB, created by Josep 'Pep' Turro Mauri on 2014-07-07 13:18:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josep 'Pep' Turro Mauri

Created: 2014-07-07 13:18:07 UTC

Size: 1.70 KB

patch

obsolete

>diff -ru sos-2.2.orig/sos/plugins/openshift.py sos-2.2/sos/plugins/openshift.py
>--- sos-2.2.orig/sos/plugins/openshift.py	2014-07-07 14:12:54.330787776 +0200
>+++ sos-2.2/sos/plugins/openshift.py	2014-07-07 15:15:34.763343564 +0200
>@@ -39,15 +39,18 @@
>     def setup(self):
>         self.gear = self.getOption('gear')
>         self.addCopySpecs([
>-            "/etc/openshift-enterprise-*",
>+            "/etc/openshift-enterprise-release",
>             "/var/log/openshift/",
>-            "/etc/openshift/"
>+            "/etc/openshift/*.conf",
>+            "/etc/openshift/upgrade/",
>         ])
> 
>         self.collectExtOutput("oo-diagnostics -v")
> 
>         if self.is_broker():
>             self.addCopySpecs([
>+                "/etc/openshift/quickstarts.json",
>+                "/etc/openshift/plugins.d/*.conf",
>                 "/var/www/openshift/broker/httpd/conf.d/*.conf",
>                 "/var/www/openshift/console/httpd/conf.d/*.conf",
>             ])
>@@ -60,6 +63,9 @@
> 
>         if self.is_node():
>             self.addCopySpecs([
>+                "/etc/openshift/node-plugins.d/*.conf",
>+                "/etc/openshift/cart.conf.d/",
>+                "/etc/openshift/env/",
>                 "/cgroup/*/openshift",
>                 "/opt/%s/%s/root/etc/mcollective/" % (self.vendor, self.ruby),
>                 "/var/log/httpd/openshift_log",
>@@ -95,8 +101,8 @@
>                 r"(SESSION_SECRET=)(.*)",
>                 r"\1*******")
> 
>-        self.doRegexSub('/etc/openshift/htpasswd',
>-                r"(.*:)(.*)",
>+        self.doRegexSub("/opt/%s/%s/root/etc/mcollective/server.cfg" % (self.vendor, self.ruby),
>+                r"(.*\.password.?=)(.*)",
>                 r"\1********")
> 
> # vim: et ts=4 sw=4

Actions: View | Diff

Attachments on bug 1039755: 846313 | 916078