From 0306c8d16d0f0fe5f12c8305806cc5bcebcaed72 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 31 Jul 2008 14:03:16 +0000
Subject: enable the ability to override if the ssh directory is managed or
 not, in situations where there is a system-wide /etc/ssh/authorized_keys
 directory, this will likely not be managed by the backupninja module, and
 managing it here will result in duplicate definitions

---
 manifests/server.pp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'manifests/server.pp')

diff --git a/manifests/server.pp b/manifests/server.pp
index 39bb5c5..ae66991 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -29,9 +29,9 @@ class backupninja::server {
   # this define allows nodes to declare a remote backup sandbox, that have to
   # get created on the server
   define sandbox(
-    $user = false, $host = false, $installuser = true, $dir = false, $ssh_dir = false,
-    $authorized_keys_file = false, $backupkeys = false, $uid = false, $gid = "backupninjas",
-    $backuptag = false)
+    $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)
   {
     
     $real_user = $name ? {
@@ -71,12 +71,17 @@ class backupninja::server {
     }
     case $installuser {
       true: {
-        @@file { "${real_ssh_dir}":
-          ensure => directory,
-          mode => 700, owner => $user, group => 0,
-          require => File["$real_dir"],
-          tag => "$real_backuptag",
+        case $manage_ssh_dir {
+          true: {
+            @@file { "${real_ssh_dir}":
+              ensure => directory,
+              mode => 700, owner => $user, group => 0,
+              require => File["$real_dir"],
+              tag => "$real_backuptag",
+            }
+          }
         }
+      }
         @@file { "${real_ssh_dir}/${real_authorized_keys_file}":
           ensure => present,
           mode => 644, owner => 0, group => 0,
-- 
cgit v1.2.3