diff options
| author | Justin Stephenson <jstephen@redhat.com> | 2016-11-04 10:22:03 -0400 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2016-11-04 15:32:26 +0000 |
| commit | 490c7b05b1670de47fe8540486137b17383949b9 (patch) | |
| tree | 11ad9d55cceaf495dfd21b0f033f030208e898ab | |
| parent | eefd207b915716cb2f77a4bd5901ca4680f818b7 (diff) | |
| download | sos-490c7b05b1670de47fe8540486137b17383949b9.tar.gz | |
[sssd] Retrieve drop directory conf files
SSSD 1.14 adds support for dropped-in configuration files in
/etc/sssd/conf.d/ - Adding these files will ensure all SSSD
configuration files are obtained.
Closes #890.
Signed-off-by: Justin Stephenson <jstephen@redhat.com>
| -rw-r--r-- | sos/plugins/sssd.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py index 1b20ff3c..29ef8c8f 100644 --- a/sos/plugins/sssd.py +++ b/sos/plugins/sssd.py @@ -28,13 +28,16 @@ class Sssd(Plugin): def setup(self): self.add_copy_spec([ "/etc/sssd/sssd.conf", - "/var/log/sssd/*" + "/var/log/sssd/*", + # SSSD 1.14 + "/etc/sssd/conf.d/*.conf" ]) def postproc(self): - self.do_file_sub("/etc/sssd/sssd.conf", - r"(\s*ldap_default_authtok\s*=\s*)\S+", - r"\1********") + regexp = r"(\s*ldap_default_authtok\s*=\s*)\S+" + + self.do_file_sub("/etc/sssd/sssd.conf", regexp, r"\1********") + self.do_path_regex_sub("/etc/sssd/conf.d/*", regexp, r"\1********") class RedHatSssd(Sssd, RedHatPlugin): |