Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp

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,18 +34,22 @@ 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)
 
+  if $manage_client {
     class{'sshd::client':
-    shared_ip        => $sshd::shared_ip,
-    ensure_version   => $sshd::ensure_version,
+      shared_ip        => $shared_ip,
+      ensure_version   => $ensure_version,
       manage_shorewall => $manage_shorewall,
     }
+  }
 
   case $::operatingsystem {
     gentoo: { include sshd::gentoo }

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