diff options
| author | Hisanobu Okuda <hokuda@redhat.com> | 2015-12-16 23:10:50 +0900 |
|---|---|---|
| committer | Hisanobu Okuda <hokuda@redhat.com> | 2015-12-16 23:10:50 +0900 |
| commit | 5ebd0bd9f06cffa1ff571f38df50ac107b8e0341 (patch) | |
| tree | 21516dbb1dbb3be729c2afd640bec34ea8d6d37d | |
| parent | 6eb6e17e368b62d667d90639227950844e954c70 (diff) | |
| download | sos-5ebd0bd9f06cffa1ff571f38df50ac107b8e0341.tar.gz | |
[apache] Added collection for JBoss Web Server
Signed-off-by: Hisanobu Okuda <hokuda@redhat.com>
| -rw-r--r-- | sos/plugins/apache.py | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py index 26deb595..4872f7bf 100644 --- a/sos/plugins/apache.py +++ b/sos/plugins/apache.py @@ -27,7 +27,9 @@ class Apache(Plugin): class RedHatApache(Apache, RedHatPlugin): - files = ('/etc/httpd/conf/httpd.conf',) + files = ('/etc/httpd/conf/httpd.conf', + '/etc/httpd22/conf/httpd.conf', + '/etc/httpd24/conf/httpd.conf') def setup(self): super(RedHatApache, self).setup() @@ -35,7 +37,14 @@ class RedHatApache(Apache, RedHatPlugin): self.add_copy_spec([ "/etc/httpd/conf/httpd.conf", "/etc/httpd/conf.d/*.conf", - "/etc/httpd/conf.modules.d/*.conf" + "/etc/httpd/conf.modules.d/*.conf", + # JBoss Enterprise Web Server 2.x + "/etc/httpd22/conf/httpd.conf", + "/etc/httpd22/conf.d/*.conf", + # Red Hat JBoss Web Server 3.x + "/etc/httpd24/conf/httpd.conf", + "/etc/httpd24/conf.d/*.conf", + "/etc/httpd24/conf.modules.d/*.conf", ]) self.add_forbidden_path("/etc/httpd/conf/password.conf") @@ -45,8 +54,24 @@ class RedHatApache(Apache, RedHatPlugin): self.add_copy_spec_limit("/var/log/httpd/error_log", 5) self.add_copy_spec_limit("/var/log/httpd/ssl_access_log", 5) self.add_copy_spec_limit("/var/log/httpd/ssl_error_log", 5) + # JBoss Enterprise Web Server 2.x + self.add_copy_spec_limit("/var/log/httpd22/access_log", 5) + self.add_copy_spec_limit("/var/log/httpd22/error_log", 5) + self.add_copy_spec_limit("/var/log/httpd22/ssl_access_log", 5) + self.add_copy_spec_limit("/var/log/httpd22/ssl_error_log", 5) + # Red Hat JBoss Web Server 3.x + self.add_copy_spec_limit("/var/log/httpd24/access_log", 5) + self.add_copy_spec_limit("/var/log/httpd24/error_log", 5) + self.add_copy_spec_limit("/var/log/httpd24/ssl_access_log", 5) + self.add_copy_spec_limit("/var/log/httpd24/ssl_error_log", 5) if self.get_option("log"): - self.add_copy_spec("/var/log/httpd/*") + self.add_copy_spec([ + "/var/log/httpd/*", + # JBoss Enterprise Web Server 2.x + "/var/log/httpd22/*", + # Red Hat JBoss Web Server 3.x + "/var/log/httpd24/*" + ]) class DebianApache(Apache, DebianPlugin, UbuntuPlugin): |