Skip to content

Commit e27c74d

Browse files
committed
core(ssg): add product-overridable SSH client path properties
1 parent e6fd405 commit e27c74d

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

ssg/constants.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,8 @@
463463
DEFAULT_SSHD_CONFIG_DIR = '/etc/ssh/sshd_config.d'
464464
DEFAULT_SSHD_HARDENING_CONFIG_BASENAME = '00-complianceascode-hardening.conf'
465465
DEFAULT_SSHD_SYSCONFIG_FILE = '/etc/sysconfig/sshd'
466+
DEFAULT_SSH_CLIENT_MAIN_CONFIG_FILE = '/etc/ssh/ssh_config'
467+
DEFAULT_SSH_CLIENT_CONFIG_DIR = '/etc/ssh/ssh_config.d'
466468
DEFAULT_PRODUCT = 'example'
467469
DEFAULT_CHRONY_CONF_PATH = '/etc/chrony.conf'
468470
DEFAULT_CHRONY_D_PATH = '/etc/chrony.d/'

ssg/products.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
DEFAULT_SSHD_CONFIG_DIR,
2222
DEFAULT_SSHD_HARDENING_CONFIG_BASENAME,
2323
DEFAULT_SSHD_SYSCONFIG_FILE,
24+
DEFAULT_SSH_CLIENT_MAIN_CONFIG_FILE,
25+
DEFAULT_SSH_CLIENT_CONFIG_DIR,
2426
DEFAULT_CHRONY_CONF_PATH,
2527
DEFAULT_CHRONY_D_PATH,
2628
DEFAULT_AUDISP_CONF_PATH,
@@ -130,6 +132,12 @@ def _get_implied_properties(existing_properties):
130132
if "sshd_sysconfig_file" not in existing_properties:
131133
result["sshd_sysconfig_file"] = DEFAULT_SSHD_SYSCONFIG_FILE
132134

135+
if "ssh_client_main_config_file" not in existing_properties:
136+
result["ssh_client_main_config_file"] = DEFAULT_SSH_CLIENT_MAIN_CONFIG_FILE
137+
138+
if "ssh_client_config_dir" not in existing_properties:
139+
result["ssh_client_config_dir"] = DEFAULT_SSH_CLIENT_CONFIG_DIR
140+
133141
if "product" not in existing_properties:
134142
result["product"] = DEFAULT_PRODUCT
135143

0 commit comments

Comments
 (0)