aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-06-10 11:25:16 +0200
committermh <mh@immerda.ch>2014-06-10 11:25:16 +0200
commitcd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0 (patch)
treeb43a48d66f9dd1ecad4d681769e1e2ead75d2e58
parentfb60c0c0c991d041084454586c2657165fe42622 (diff)
parent5c23b33200fc6229ada7f4e13672b5da0d4bdd8e (diff)
downloadpuppet-sshd-cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0.tar.gz
puppet-sshd-cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0.tar.bz2
Merge remote-tracking branch 'shared/master'
Conflicts: manifests/init.pp
-rw-r--r--manifests/init.pp16
-rw-r--r--templates/sshd_config/Debian_wheezy.erb1
2 files changed, 11 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 62d055d..d005d60 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,7 +26,7 @@ class sshd(
$rhosts_rsa_authentication = 'no',
$hostbased_authentication = 'no',
$permit_empty_passwords = 'no',
- $authorized_keys_file = '%h/.ssh/authorized_keys',
+ $authorized_keys_file = '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2',
$hardened_ssl = 'no',
$sftp_subsystem = '',
$head_additional_options = '',
@@ -34,17 +34,21 @@ class sshd(
$print_motd = 'yes',
$manage_shorewall = false,
$shorewall_source = 'net',
- $sshkey_ipaddress = $::ipaddress
+ $sshkey_ipaddress = $::ipaddress,
+ $manage_client = true,
) {
validate_bool($manage_shorewall)
+ validate_bool($manage_client)
validate_array($listen_address)
validate_array($ports)
- class{'sshd::client':
- shared_ip => $sshd::shared_ip,
- ensure_version => $sshd::ensure_version,
- manage_shorewall => $manage_shorewall,
+ if $manage_client {
+ class{'sshd::client':
+ shared_ip => $shared_ip,
+ ensure_version => $ensure_version,
+ manage_shorewall => $manage_shorewall,
+ }
}
case $::operatingsystem {
diff --git a/templates/sshd_config/Debian_wheezy.erb b/templates/sshd_config/Debian_wheezy.erb
index 70bb4bf..cdcebfe 100644
--- a/templates/sshd_config/Debian_wheezy.erb
+++ b/templates/sshd_config/Debian_wheezy.erb
@@ -24,6 +24,7 @@ Protocol 2
# HostKeys for protocol version 2
HostKey /etc/ssh/ssh_host_rsa_key
HostKey /etc/ssh/ssh_host_dsa_key
+HostKey /etc/ssh/ssh_host_ecdsa_key
#Privilege Separation is turned on for security
UsePrivilegeSeparation yes