From 856beebe69dedfb23fe8a51ba7eed7846dba121a Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 13 Jul 2009 04:46:23 -0300 Subject: adding support for keytypes in backupninja server. --- manifests/server.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/server.pp') diff --git a/manifests/server.pp b/manifests/server.pp index 162d889..213022b 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -30,8 +30,8 @@ class backupninja::server { # get created on the server define sandbox( $user = false, $host = false, $installuser = true, $dir = false, $manage_ssh_dir = true, - $ssh_dir = false, $authorized_keys_file = false, $backupkeys = false, $uid = false, - $gid = "backupninjas", $backuptag = false) + $ssh_dir = false, $authorized_keys_file = false, $backupkeys = false, $keytype = "rsa", + $uid = false, $gid = "backupninjas", $backuptag = false) { $real_user = $name ? { @@ -84,7 +84,7 @@ class backupninja::server { @@file { "${real_ssh_dir}/${real_authorized_keys_file}": ensure => present, mode => 0644, owner => 0, group => 0, - source => "$real_backupkeys/${user}_id_rsa.pub", + source => "$real_backupkeys/${user}_id_${keytype}.pub", require => File["${real_ssh_dir}"], tag => "$real_backuptag", } -- cgit v1.2.3 From bc167339c62ad2e06c8cdcd298364f20afa04658 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 16 Jul 2009 18:23:05 -0300 Subject: Checking whether an exported resource is defined Checking whether an exported resource is already defined at backupninja::server::sandbox, otherwise puppet will try to redefined them each time a backup resource type is invoked with the same arguments (such as $directory), raising an error. --- manifests/server.pp | 84 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 37 deletions(-) (limited to 'manifests/server.pp') diff --git a/manifests/server.pp b/manifests/server.pp index 213022b..fa85492 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -63,57 +63,67 @@ class backupninja::server { false => "backupninja-$real_host", default => $backuptag, } - - @@file { "$real_dir": - ensure => directory, - mode => 0750, owner => $user, group => 0, - tag => "$real_backuptag", + + if !defined(File["$real_dir"]) { + @@file { "$real_dir": + ensure => directory, + mode => 0750, owner => $user, group => 0, + tag => "$real_backuptag", + } } case $installuser { true: { case $manage_ssh_dir { true: { - @@file { "${real_ssh_dir}": - ensure => directory, - mode => 0700, owner => $user, group => 0, - require => File["$real_dir"], - tag => "$real_backuptag", + if !defined(File["$real_ssh_dir"]) { + @@file { "${real_ssh_dir}": + ensure => directory, + mode => 0700, owner => $user, group => 0, + require => File["$real_dir"], + tag => "$real_backuptag", + } } } } - @@file { "${real_ssh_dir}/${real_authorized_keys_file}": - ensure => present, - mode => 0644, owner => 0, group => 0, - source => "$real_backupkeys/${user}_id_${keytype}.pub", - require => File["${real_ssh_dir}"], - tag => "$real_backuptag", + if !defined(File["$real_ssh_dir"]) { + @@file { "${real_ssh_dir}/${real_authorized_keys_file}": + ensure => present, + mode => 0644, owner => 0, group => 0, + source => "$real_backupkeys/${user}_id_${keytype}.pub", + require => File["${real_ssh_dir}"], + tag => "$real_backuptag", + } } case $uid { false: { - @@user { "$user": - ensure => "present", - gid => "$gid", - comment => "$name backup sandbox", - home => "$real_dir", - managehome => true, - shell => "/bin/sh", - password => '*', - require => Group['backupninjas'], - tag => "$real_backuptag" + if !defined(File["$real_ssh_dir"]) { + @@user { "$user": + ensure => "present", + gid => "$gid", + comment => "$name backup sandbox", + home => "$real_dir", + managehome => true, + shell => "/bin/sh", + password => '*', + require => Group['backupninjas'], + tag => "$real_backuptag" + } } } default: { - @@user { "$user": - ensure => "present", - uid => "$uid", - gid => "$gid", - comment => "$name backup sandbox", - home => "$real_dir", - managehome => true, - shell => "/bin/sh", - password => '*', - require => Group['backupninjas'], - tag => "$real_backuptag" + if !defined(File["$real_ssh_dir"]) { + @@user { "$user": + ensure => "present", + uid => "$uid", + gid => "$gid", + comment => "$name backup sandbox", + home => "$real_dir", + managehome => true, + shell => "/bin/sh", + password => '*', + require => Group['backupninjas'], + tag => "$real_backuptag" + } } } } -- cgit v1.2.3 From 30237b7ed066509b53bc1f53ffe797d9041856db Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 26 Aug 2009 21:37:43 -0300 Subject: Fixing some definitions at backupninja::server::sandbox --- manifests/server.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/server.pp') diff --git a/manifests/server.pp b/manifests/server.pp index fa85492..28b97d5 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -85,7 +85,7 @@ class backupninja::server { } } } - if !defined(File["$real_ssh_dir"]) { + if !defined(File["${real_ssh_dir}/${real_authorized_keys_file}"]) { @@file { "${real_ssh_dir}/${real_authorized_keys_file}": ensure => present, mode => 0644, owner => 0, group => 0, @@ -96,7 +96,7 @@ class backupninja::server { } case $uid { false: { - if !defined(File["$real_ssh_dir"]) { + if !defined(File["$real_user"]) { @@user { "$user": ensure => "present", gid => "$gid", @@ -111,8 +111,8 @@ class backupninja::server { } } default: { - if !defined(File["$real_ssh_dir"]) { - @@user { "$user": + if !defined(File["$real_user"]) { + @@user { "$real_user": ensure => "present", uid => "$uid", gid => "$gid", -- cgit v1.2.3 From 02d8a40959f4376742d6c813aa3e44e79c56c429 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 26 Aug 2009 21:54:25 -0300 Subject: Fixing some definitions at backupninja::server::sandbox (2) --- manifests/server.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/server.pp') diff --git a/manifests/server.pp b/manifests/server.pp index 28b97d5..790c931 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -96,8 +96,8 @@ class backupninja::server { } case $uid { false: { - if !defined(File["$real_user"]) { - @@user { "$user": + if !defined(User["$real_user"]) { + @@user { "$real_user": ensure => "present", gid => "$gid", comment => "$name backup sandbox", @@ -111,7 +111,7 @@ class backupninja::server { } } default: { - if !defined(File["$real_user"]) { + if !defined(User["$real_user"]) { @@user { "$real_user": ensure => "present", uid => "$uid", -- cgit v1.2.3