diff options
| author | Antoine Beaupré <anarcat+gitlab@anarc.at> | 2015-04-17 18:43:16 +0000 |
|---|---|---|
| committer | Antoine Beaupré <anarcat+gitlab@anarc.at> | 2015-04-17 18:43:16 +0000 |
| commit | d4923b2c3ad74d813a9a2e5b39b6fa171ee95bc0 (patch) | |
| tree | d5827edd094604c5b73630fc0be7a5dd3bd7a833 /manifests | |
| parent | 953ad0f7773da4ba90df9e049eaa6e61cdcaaffe (diff) | |
| parent | 5c9ce49321f4ea5d502eca98d9e9a23bae57b1da (diff) | |
| download | puppet-sshd-d4923b2c3ad74d813a9a2e5b39b6fa171ee95bc0.tar.gz puppet-sshd-d4923b2c3ad74d813a9a2e5b39b6fa171ee95bc0.tar.bz2 | |
Merge branch 'hostkey_type' into 'master'
Hostkey type
This is the pull request associated with: https://labs.riseup.net/code/issues/8285
See merge request !6
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 666b5ac..0f8c472 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -49,6 +49,10 @@ class sshd( $shorewall_source = 'net', $sshkey_ipaddress = $::ipaddress, $manage_client = true, + $hostkey_type = versioncmp($::ssh_version, '6.5') ? { + /(^1|0)/ => [ 'rsa', 'ed25519' ], + /-1/ => [ 'rsa', 'dsa' ] + } ) { validate_bool($manage_shorewall) |