From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 16 Mar 2014 19:54:37 +0000 (-0300)
Subject: Defining nodo::subsystem::ssh_folder as resource type
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=96943608ea4a83ec6978c955ce1e1011c64e668e;p=puppet-nodo.git

Defining nodo::subsystem::ssh_folder as resource type
---

diff --git a/manifests/defines/ssh_config.pp b/manifests/defines/ssh_config.pp
index d071822..5585520 100644
--- 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 3608b7e..77d1f00 100644
--- 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 89e91a6..e61ec02 100644
--- 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 dad17ac..c0d7157 100644
--- 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 99d8361..f2828a2 100644
--- 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,