|
 |
f2c821 |
From bbd28011f8bb710d64283bd6d3ec68c0fb5430b4 Mon Sep 17 00:00:00 2001
|
|
|
f2c821 |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
f2c821 |
Date: Fri, 6 Nov 2020 21:28:37 +0100
|
|
|
f2c821 |
Subject: [PATCH] [ovirt] collect /etc/pki/ovirt-engine/.truststore
|
|
|
f2c821 |
|
|
|
f2c821 |
.truststore contains useful public CAs but a_c_s skips collecting
|
|
|
f2c821 |
that hidden file.
|
|
|
f2c821 |
|
|
|
f2c821 |
Closes: #2296
|
|
|
f2c821 |
Resolves: #2297
|
|
|
f2c821 |
|
|
|
f2c821 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
f2c821 |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
f2c821 |
---
|
|
|
f2c821 |
sos/report/plugins/ovirt.py | 7 +++++--
|
|
|
f2c821 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
f2c821 |
|
|
|
f2c821 |
diff --git a/sos/report/plugins/ovirt.py b/sos/report/plugins/ovirt.py
|
|
|
f2c821 |
index 4c112cac..127c971c 100644
|
|
|
f2c821 |
--- a/sos/report/plugins/ovirt.py
|
|
|
f2c821 |
+++ b/sos/report/plugins/ovirt.py
|
|
|
f2c821 |
@@ -137,12 +137,15 @@ class Ovirt(Plugin, RedHatPlugin):
|
|
|
f2c821 |
"/var/lib/ovirt-engine-reports/jboss_runtime/config"
|
|
|
f2c821 |
])
|
|
|
f2c821 |
|
|
|
f2c821 |
- # Copying host certs.
|
|
|
f2c821 |
+ # Copying host certs; extra copy the hidden .truststore file
|
|
|
f2c821 |
self.add_forbidden_path([
|
|
|
f2c821 |
"/etc/pki/ovirt-engine/keys",
|
|
|
f2c821 |
"/etc/pki/ovirt-engine/private"
|
|
|
f2c821 |
])
|
|
|
f2c821 |
- self.add_copy_spec("/etc/pki/ovirt-engine/")
|
|
|
f2c821 |
+ self.add_copy_spec([
|
|
|
f2c821 |
+ "/etc/pki/ovirt-engine/",
|
|
|
f2c821 |
+ "/etc/pki/ovirt-engine/.truststore",
|
|
|
f2c821 |
+ ])
|
|
|
f2c821 |
|
|
|
f2c821 |
def postproc(self):
|
|
|
f2c821 |
"""
|
|
|
f2c821 |
--
|
|
|
f2c821 |
2.26.2
|
|
|
f2c821 |
|