merged with riseup module, various cleaning up

3 files changed, 13 insertions, 12 deletions

diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 2c3e31f..33d9f9e 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,9 +1,9 @@
 class sshd::client::base {
-    # this is needed because the gid might have changed
-    file { '/etc/ssh/ssh_known_hosts':
-            mode => 0644, owner => root, group => 0;
-    }
+  # this is needed because the gid might have changed
+  file { '/etc/ssh/ssh_known_hosts':
+    owner => root, group => 0, mode => 0644;
+  }
 
-    # Now collect all server keys
-    Sshkey <<||>>
+  # Now collect all server keys
+  Sshkey <<||>>
 }
diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
index 9ca6da9..2aaf3fb 100644
--- a/manifests/client/debian.pp
+++ b/manifests/client/debian.pp
@@ -1,5 +1,5 @@
 class sshd::client::debian inherits sshd::client::linux {
-    Package['openssh-clients']{
-        name => 'openssh-client',
-    }
+  Package['openssh-clients']{
+    name => 'openssh-client',
+  }
 }
diff --git a/manifests/client/linux.pp b/manifests/client/linux.pp
index 522fa50..8c58ca8 100644
--- a/manifests/client/linux.pp
+++ b/manifests/client/linux.pp
@@ -1,5 +1,6 @@
 class sshd::client::linux inherits sshd::client::base {
-    package {'openssh-clients':
-        ensure => installed,
-    }
+  if $ssh_ensure_version == '' { $ssh_ensure_version = 'installed' }
+  package {'openssh-clients':
+    ensure => $ssh_ensure_version,
+  }
 }