client, platform: Use paths.SSH* instead of get_config_dir().

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Timo Aaltonen authored and Martin Basti committed 2017-01-05 17:50:03 +01:00
1 parent ceb26f5ac4
commit 0ff12de338
4 files changed
+17 -37

No files matched your search

+1
View File
@@ -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"
-3
View File
@@ -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"
-7
View File
@@ -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)