Defining nodo::subsystem::ssh_folder as a parametrized class

diff --git a/manifests/defines/ssh_config.pp b/manifests/defines/ssh_config.pp
index 79d96350a6ea80db803e0017cdf528a2a234d71a..d0718226a997b57a96bd0411a29c4a9f9553be61 100644 (file)
--- a/manifests/defines/ssh_config.pp
+++ b/manifests/defines/ssh_config.pp
@@ -1,10 +1,15 @@
 # Manage ssh config for a particular user
 define ssh_config(
   $owner,
+  $group,
   $home               = '/home/$owner',
   $ssh_localhost_auth = false
 ) {
-  include nodo::subsystem::ssh_folder
+  class { "nodo::subsystem::ssh_folder":
+    home  => $home,
+    owner => $owner,
+    group => $group,
+  }
 
   file { "${home}/.ssh/config":
     ensure  => present,

diff --git a/manifests/defines/ssh_create_key.pp b/manifests/defines/ssh_create_key.pp
index ec4bb67947128c4e147f4680f46687e3bd6e6976..3608b7e338cf25e576893d623e1aa01b491b7221 100644 (file)
--- a/manifests/defines/ssh_create_key.pp
+++ b/manifests/defines/ssh_create_key.pp
@@ -4,7 +4,11 @@ define ssh_create_key(
   $keyfile = 'id_rsa',
   $home    = '/home/$owner'
 ) {
-  include nodo::subsystem::ssh_folder
+  class { "nodo::subsystem::ssh_folder":
+    home  => $home,
+    owner => $owner,
+    group => $group,
+  }
 
   exec { "ssh-keygen-${owner}":
     command => "ssh-keygen -t rsa -P '' -f ${home}/.ssh/${keyfile}",

diff --git a/manifests/defines/ssh_known_hosts.pp b/manifests/defines/ssh_known_hosts.pp
index 84f25b2e0af18d9495d2cf549f7fd3e61a45f50b..dad17ac1074e94f22dad2709012b1871be4e8ee9 100644 (file)
--- a/manifests/defines/ssh_known_hosts.pp
+++ b/manifests/defines/ssh_known_hosts.pp
@@ -4,7 +4,11 @@ define ssh_known_host(
   $home               = '/home/$owner',
   $ssh_localhost_auth = false
 ) {
-  include nodo::subsystem::ssh_folder
+  class { "nodo::subsystem::ssh_folder":
+    home  => $home,
+    owner => $owner,
+    group => $group,
+  }
 
   file { "${home}/.ssh/known_hosts":
     ensure  => present,

diff --git a/manifests/defines/ssh_local_key.pp b/manifests/defines/ssh_local_key.pp
index be6ccd8d92d8bee7a8ce4da56c4ec10c01b9220c..99d8361b53f3eae9d0acfc6b1201ba0f68015096 100644 (file)
--- a/manifests/defines/ssh_local_key.pp
+++ b/manifests/defines/ssh_local_key.pp
@@ -7,7 +7,11 @@ define ssh_local_key(
   $dest   = 'id_rsa',
   $ensure = 'present',
 ) {
-  include nodo::subsystem::ssh_folder
+  class { "nodo::subsystem::ssh_folder":
+    home  => $home,
+    owner => $owner,
+    group => $group,
+  }
 
   file { "${home}/.ssh/${dest}":
     ensure  => $ensure,

diff --git a/manifests/subsystem/ssh_folder.pp b/manifests/subsystem/ssh_folder.pp
index 1c6ee491a60bf2aedd730b45ecb6a6d0bd5267e1..89e91a615e87add2141ed652c9047b164ceff43d 100644 (file)
--- a/manifests/subsystem/ssh_folder.pp
+++ b/manifests/subsystem/ssh_folder.pp
@@ -1,5 +1,9 @@
 # Base class
-class nodo::subsystem::ssh_folder {
+class nodo::subsystem::ssh_folder(
+  $home,
+  $owner,
+  $group,
+) {
   if !defined(File["${home}/.ssh"]) {
     file { "${home}/.ssh":
       ensure  => directory,