diff options
author | Bryn M. Reeves <bmr@redhat.com> | 2012-12-04 20:32:42 +0000 |
---|---|---|
committer | Bryn M. Reeves <bmr@redhat.com> | 2012-12-04 20:32:42 +0000 |
commit | 205ff686a35db7d21a02b6828c6058f52707cdef (patch) | |
tree | 49cd3a559793fcdc3c6cac684c8a78bb476b6ff1 | |
parent | 248d4649cb38f313a1bafacb28cb048d08033f79 (diff) | |
download | sos-205ff686a35db7d21a02b6828c6058f52707cdef.tar.gz |
Use correct paths for tomcat6 in RHN module
-rw-r--r-- | sos/plugins/rhn.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index eb12c818..424fc1d9 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -67,11 +67,8 @@ class rhn(Plugin, RedHatPlugin): if self.satellite: self.addCopySpecs(["/etc/tnsnames.ora", "/etc/jabberd"]) - # tomcat (4.x and newer satellites only) - if not self.policy().pkgNVRA(satellite)[1].startswith("3."): - self.addCopySpecs(["/etc/tomcat5", "/var/log/tomcat5"]) - - self.addCopySpecs(["/etc/tomcat5", "/var/log/tomcat5"]) + self.addCopySpec("/etc/tomcat6/") + self.addCopySpec("/var/log/tomcat6/") if self.proxy: self.addCopySpecs(["/etc/squid", "/var/log/squid"]) |