EL7 main service file requires mandatory environment file

note, that this is not the case for the instantiated, which is in sync
with everything else.

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Jakub Jelen 2024-02-06 10:09:06 +01:00 committed by Jakub Jelen
parent 237e8b4255
commit ec0f975ce3
3 changed files with 3 additions and 1 deletions

View file

@ -13,7 +13,7 @@ Documentation=man:sshd(8) man:sshd_config(5)
[Service]
Type=notify
{% if __sshd_environment_file is string %}
EnvironmentFile=-{{ __sshd_environment_file }}
EnvironmentFile={{ __sshd_environment_file_mandatory | ternary('', '-')}}{{ __sshd_environment_file }}
{% elif __sshd_environment_file is iterable %}
{% for file in __sshd_environment_file %}
EnvironmentFile=-{{ file }}

View file

@ -33,6 +33,7 @@ __sshd_hostkeys_nofips:
- /etc/ssh/ssh_host_ed25519_key
__sshd_environment_file: /etc/sysconfig/sshd
__sshd_environment_file_mandatory: true
__sshd_environment_variable: $OPTIONS
__sshd_service_after: sshd-keygen.service
__sshd_service_wants: sshd-keygen.service

View file

@ -67,6 +67,7 @@ __sshd_supports_validate: true
# The path to an environment file for the SSHD service
__sshd_environment_file: ~
__sshd_environment_file_mandatory: false
# The variable name we are passing from the environment file as an argument to the sshd
__sshd_environment_variable: $OPTIONS