diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-16 16:54:37 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-16 16:54:37 -0300 |
commit | 96943608ea4a83ec6978c955ce1e1011c64e668e (patch) | |
tree | 1a8c215ddcdea63b0362c2d354b6d96981256f31 | |
parent | 5055135b544026487c79d3cc71cfebf94c1fd994 (diff) | |
download | puppet-nodo-96943608ea4a83ec6978c955ce1e1011c64e668e.tar.gz puppet-nodo-96943608ea4a83ec6978c955ce1e1011c64e668e.tar.bz2 |
Defining nodo::subsystem::ssh_folder as resource type
-rw-r--r-- | manifests/defines/ssh_config.pp | 2 | ||||
-rw-r--r-- | manifests/defines/ssh_create_key.pp | 2 | ||||
-rw-r--r-- | manifests/defines/ssh_folder.pp (renamed from manifests/subsystem/ssh_folder.pp) | 4 | ||||
-rw-r--r-- | manifests/defines/ssh_known_hosts.pp | 2 | ||||
-rw-r--r-- | manifests/defines/ssh_local_key.pp | 2 |
5 files changed, 6 insertions, 6 deletions
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 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, |