diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2017-09-24 01:51:10 +0100 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2017-09-24 01:51:10 +0100 |
| commit | 1783d7b8ff4f3585d70d3e4f02c7eedae2af4bfc (patch) | |
| tree | 014cdb6a1d4f697d1aaa403363f70130144962ef /modules | |
| parent | 14950b410cb2836c40d86d76ad14ce96789314da (diff) | |
| download | puppet-1783d7b8ff4f3585d70d3e4f02c7eedae2af4bfc.tar puppet-1783d7b8ff4f3585d70d3e4f02c7eedae2af4bfc.tar.gz puppet-1783d7b8ff4f3585d70d3e4f02c7eedae2af4bfc.tar.bz2 puppet-1783d7b8ff4f3585d70d3e4f02c7eedae2af4bfc.tar.xz puppet-1783d7b8ff4f3585d70d3e4f02c7eedae2af4bfc.zip | |
Workaround lack of mga6 support in our configs
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/openssh/manifests/server.pp | 1 | ||||
| -rw-r--r-- | modules/openssh/templates/sshd_config | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/modules/openssh/manifests/server.pp b/modules/openssh/manifests/server.pp index a162c8d5..c45268d2 100644 --- a/modules/openssh/manifests/server.pp +++ b/modules/openssh/manifests/server.pp @@ -1,5 +1,6 @@ class openssh::server { # some trick to manage sftp server, who is arch dependent on mdv + # TODO: the path changed on Mageia 6 to /usr/libexec/openssh/sftp-server $path_to_sftp = "${::lib_dir}/ssh/" package { 'openssh-server': } diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config index 76b11bec..039467a7 100644 --- a/modules/openssh/templates/sshd_config +++ b/modules/openssh/templates/sshd_config @@ -22,7 +22,12 @@ HostKey /etc/ssh/ssh_host_key # HostKeys for protocol version 2 HostKey /etc/ssh/ssh_host_rsa_key +<% if @hostname == 'neru' then %> +HostKey /etc/ssh/ssh_host_ecdsa_key +HostKey /etc/ssh/ssh_host_ed25519_key +<% else %> HostKey /etc/ssh/ssh_host_dsa_key +<% end %> # Lifetime and size of ephemeral version 1 server key #KeyRegenerationInterval 1h @@ -114,7 +119,11 @@ UsePrivilegeSeparation yes #Banner none # override default of no subsystems +<% if @hostname == 'neru' then %> +Subsystem sftp /usr/libexec/openssh/sftp-server +<% else %> Subsystem sftp <%= path_to_sftp %>/sftp-server +<% end %> # Example of overriding settings on a per-user basis #Match User anoncvs |