Defining nodo::subsystem::ssh_folder as resource type

diff --git a/manifests/defines/ssh_config.pp b/manifests/defines/ssh_config.pp
index d0718226a997b57a96bd0411a29c4a9f9553be61..55855208b94b41b199987c39c2631926fe8b4406 100644 (file)
--- a/manifests/defines/ssh_config.pp
+++ b/manifests/defines/ssh_config.pp
@@ -5,7 +5,7 @@ define ssh_config(
   $home               = '/home/$owner',
   $ssh_localhost_auth = false
 ) {
-  class { "nodo::subsystem::ssh_folder":
+  ssh_folder { "ssh-config-${name}":
     home  => $home,
     owner => $owner,
     group => $group,

diff --git a/manifests/defines/ssh_create_key.pp b/manifests/defines/ssh_create_key.pp
index 3608b7e338cf25e576893d623e1aa01b491b7221..77d1f006ef3967c86df07f4f51f25a9555e1e412 100644 (file)
--- a/manifests/defines/ssh_create_key.pp
+++ b/manifests/defines/ssh_create_key.pp
@@ -4,7 +4,7 @@ define ssh_create_key(
   $keyfile = 'id_rsa',
   $home    = '/home/$owner'
 ) {
-  class { "nodo::subsystem::ssh_folder":
+  ssh_folder { "ssh_create_key-${name}":
     home  => $home,
     owner => $owner,
     group => $group,

diff --git a/manifests/subsystem/ssh_folder.pp b/manifests/defines/ssh_folder.pp
similarity index 81%
rename from manifests/subsystem/ssh_folder.pp
rename to manifests/defines/ssh_folder.pp
index 89e91a615e87add2141ed652c9047b164ceff43d..e61ec025717a23581bbbd67062063af8c80a5dd3 100644 (file)
--- a/manifests/subsystem/ssh_folder.pp
+++ b/manifests/defines/ssh_folder.pp
@@ -1,5 +1,5 @@
-# Base class
-class nodo::subsystem::ssh_folder(
+# Manage a ssh folder
+define ssh_folder(
   $home,
   $owner,
   $group,

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

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