diff options
| author | Timo Aaltonen <tjaalton@debian.org> | 2016-12-01 14:08:58 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-01-05 17:50:03 +0100 |
| commit | 0ff12de338a8db32bb10e1b41f32255e7b971b6f (patch) | |
| tree | de076c38819faa45455d28a29d9e902f5929a68a /ipaplatform | |
| parent | ceb26f5ac428cdbed8ec1fa89e9ed6f1d903a5a0 (diff) | |
| download | freeipa-0ff12de338a8db32bb10e1b41f32255e7b971b6f.tar.gz freeipa-0ff12de338a8db32bb10e1b41f32255e7b971b6f.tar.xz freeipa-0ff12de338a8db32bb10e1b41f32255e7b971b6f.zip | |
client, platform: Use paths.SSH* instead of get_config_dir().
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/paths.py | 1 | ||||
| -rw-r--r-- | ipaplatform/base/services.py | 3 | ||||
| -rw-r--r-- | ipaplatform/redhat/services.py | 7 |
3 files changed, 1 insertions, 10 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 896fa9d98..0ba64efdb 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -99,6 +99,7 @@ class BasePathNamespace(object): SAMBA_KEYTAB = "/etc/samba/samba.keytab" SMB_CONF = "/etc/samba/smb.conf" LIMITS_CONF = "/etc/security/limits.conf" + SSH_CONFIG_DIR = "/etc/ssh" SSH_CONFIG = "/etc/ssh/ssh_config" SSHD_CONFIG = "/etc/ssh/sshd_config" SSSD_CONF = "/etc/sssd/sssd.conf" diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py index 071fe2a32..9c9a5ae78 100644 --- a/ipaplatform/base/services.py +++ b/ipaplatform/base/services.py @@ -185,9 +185,6 @@ class PlatformService(object): def remove(self, instance_name=""): return - def get_config_dir(self, instance_name=""): - return - class SystemdService(PlatformService): SYSTEMD_SRV_TARGET = "%s.target.wants" diff --git a/ipaplatform/redhat/services.py b/ipaplatform/redhat/services.py index 99904ce9f..cc5d67477 100644 --- a/ipaplatform/redhat/services.py +++ b/ipaplatform/redhat/services.py @@ -186,11 +186,6 @@ class RedHatIPAService(RedHatService): self.restart(instance_name) -class RedHatSSHService(RedHatService): - def get_config_dir(self, instance_name=""): - return '/etc/ssh' - - class RedHatCAService(RedHatService): def wait_until_running(self): root_logger.debug('Waiting until the CA is running') @@ -248,8 +243,6 @@ def redhat_service_class_factory(name, api=None): return RedHatDirectoryService(name, api) if name == 'ipa': return RedHatIPAService(name, api) - if name == 'sshd': - return RedHatSSHService(name, api) if name in ('pki-tomcatd', 'pki_tomcatd'): return RedHatCAService(name, api) return RedHatService(name, api) |