diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-15 14:21:45 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-15 14:24:41 -0700 |
| commit | 0e517856b8db239fc2ae29ff4d5f007b5d1d0441 (patch) | |
| tree | 828dc0c7c146e7aad71376eee9069f21ae2c3a15 /modules/openssh/templates/sshd_config | |
| parent | a8116343fd31737660b56357f4179f7cf2584255 (diff) | |
| download | puppet-0e517856b8db239fc2ae29ff4d5f007b5d1d0441.tar puppet-0e517856b8db239fc2ae29ff4d5f007b5d1d0441.tar.gz puppet-0e517856b8db239fc2ae29ff4d5f007b5d1d0441.tar.bz2 puppet-0e517856b8db239fc2ae29ff4d5f007b5d1d0441.tar.xz puppet-0e517856b8db239fc2ae29ff4d5f007b5d1d0441.zip | |
Remove conditionals for releases older than Mageia 6
This eliminates a bunch of conditionals, simplifying the configuration.
We no longer have any servers running on a release older than this.
Diffstat (limited to 'modules/openssh/templates/sshd_config')
| -rw-r--r-- | modules/openssh/templates/sshd_config | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config index 43c3f9c5..56ddd725 100644 --- a/modules/openssh/templates/sshd_config +++ b/modules/openssh/templates/sshd_config @@ -18,18 +18,10 @@ # The default requires explicit activation of protocol 1 #Protocol 2 -<% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> -# HostKey for protocol version 1 -HostKey /etc/ssh/ssh_host_key -<% end %> # HostKeys for protocol version 2 HostKey /etc/ssh/ssh_host_rsa_key -<% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> -HostKey /etc/ssh/ssh_host_dsa_key -<% else %> HostKey /etc/ssh/ssh_host_ecdsa_key HostKey /etc/ssh/ssh_host_ed25519_key -<% end %> # Lifetime and size of ephemeral version 1 server key #KeyRegenerationInterval 1h @@ -106,9 +98,6 @@ X11Forwarding yes #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -<% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> -UsePrivilegeSeparation yes -<% end %> #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 @@ -123,11 +112,7 @@ UsePrivilegeSeparation yes #Banner none # override default of no subsystems -<% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> -Subsystem sftp <%= path_to_sftp %>/sftp-server -<% else %> Subsystem sftp /usr/libexec/openssh/sftp-server -<% end %> # Example of overriding settings on a per-user basis #Match User anoncvs |