diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2012-03-06 10:05:00 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-03-19 17:50:55 +0000 |
| commit | 0a6a01869b1b347b9a1e6608dd60ded517d7a6f8 (patch) | |
| tree | a3e4b6b4c05ff3a6fc3132bffa0411571a0cca0d | |
| parent | 862977fe6f7d7d805be5cca20e3d7dfcba2666f0 (diff) | |
| download | sos-0a6a01869b1b347b9a1e6608dd60ded517d7a6f8.tar.gz | |
Use correct paths for tomcat6 in RHN module
Resolves: bz749279
| -rw-r--r-- | sos/plugins/rhn.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py index cbed6a33..c8d34bf0 100644 --- a/sos/plugins/rhn.py +++ b/sos/plugins/rhn.py @@ -72,13 +72,8 @@ class rhn(sos.plugintools.PluginBase): self.addCopySpec("/etc/tnsnames.ora") self.addCopySpec("/etc/jabberd") - # tomcat (4.x and newer satellites only) - if not self.policy().pkgNVRA(satellite)[1].startswith("3."): - self.addCopySpec("/etc/tomcat5") - self.addCopySpec("/var/log/tomcat5") - - self.addCopySpec("/etc/tomcat5/") - self.addCopySpec("/var/log/tomcat5/") + self.addCopySpec("/etc/tomcat6/") + self.addCopySpec("/var/log/tomcat6/") if self.proxy: # copying configuration information |