diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-07-25 10:51:00 -0700 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-07-25 10:51:00 -0700 |
| commit | 84426151c24d613479c5858c842c91512a425da4 (patch) | |
| tree | 9c35c253d1ff5fea6051fdb13a32c4facb973de1 | |
| parent | e7f4a66d40bc1cff8fcb24fda53336c9883c645c (diff) | |
| parent | 4e97b29ad497cf8f829fdd26f7ce0c72b6dc4bcc (diff) | |
| download | sos-84426151c24d613479c5858c842c91512a425da4.tar.gz | |
Merge pull request #168 from jnpkrn/patch-luci
cluster plugin: restrictions wrt. luci
| -rw-r--r-- | sos/plugins/cluster.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index 8a3432ea..12a00622 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -55,9 +55,10 @@ class Cluster(Plugin, RedHatPlugin): self.add_copy_spec("/etc/sysconfig/cman") self.add_copy_spec("/etc/fence_virt.conf") self.add_copy_spec("/var/lib/ricci") - self.add_copy_spec("/var/lib/luci") + self.add_copy_spec("/var/lib/luci/data/luci.db") + self.add_copy_spec("/var/lib/luci/etc") self.add_copy_spec("/var/log/cluster") - self.add_copy_spec("/var/log/luci/luci.log") + self.add_copy_spec("/var/log/luci") self.add_copy_spec("/etc/fence_virt.conf") if self.get_option('gfslockdump'): @@ -144,6 +145,8 @@ class Cluster(Plugin, RedHatPlugin): self.do_file_sub(cluster_conf, r"(\s*\<fencedevice\s*.*\s*passwd\s*=\s*)\S+(\")", r"\1%s" %('"***"')) + for luci_cfg in glob("/var/lib/luci/etc/*.ini*"): + self.do_file_sub(luci_cfg, r"(.*secret\s*=\s*)\S+", r"\1******") self.do_cmd_output_sub("corosync-objctl", r"(.*fence.*\.passwd=)(.*)", r"\1******") |