From: mh <mh@immerda.ch>
Date: Tue, 10 Jun 2014 09:25:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0;p=puppet-sshd.git

Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp
---

cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0
diff --cc manifests/init.pp
index 62d055d,c85d3d6..d005d60
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -34,17 -34,15 +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        => $sshd::shared_ip,
 -      ensure_version   => $sshd::ensure_version,
++      shared_ip        => $shared_ip,
++      ensure_version   => $ensure_version,
+       manage_shorewall => $manage_shorewall,
+     }
    }
  
    case $::operatingsystem {