fix conflicts

strider · Mar 3, 2014 · 40bdca2 · 40bdca2
2 parents 90f991b + b224323
commit 40bdca2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -1,4 +1,5 @@
 class ssh::client(
+  $ensure  = present,
   $options = {}
 ) inherits ssh::params {
   $merged_options = merge($ssh::params::ssh_default_options, $options)

diff --git a/manifests/client/install.pp b/manifests/client/install.pp
@@ -1,8 +1,10 @@
-class ssh::client::install inherits ssh::params {
+class ssh::client::install (
+  $ensure = present
+) inherits ssh::params {
   if $ssh::params::client_package_name {
     if !defined(Package[$ssh::params::client_package_name]) {
       package { $ssh::params::client_package_name:
-        ensure => present,
+        ensure => $ensure,
       }
     }
   }

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -1,4 +1,5 @@
 class ssh::server(
+  $ensure          = present,
   $options         = {}
 ) inherits ssh::params {
   $merged_options = merge($ssh::params::sshd_default_options, $options)

diff --git a/manifests/server/install.pp b/manifests/server/install.pp
@@ -1,8 +1,10 @@
-class ssh::server::install inherits ssh::params {
+class ssh::server::install (
+    $ensure = present
+) inherits ssh::params {
   if $ssh::params::server_package_name {
     if !defined(Package[$ssh::params::server_package_name]) {
       package { $ssh::params::server_package_name:
-        ensure => present,
+        ensure => $ensure,
       }
     }
   }