From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 20 Feb 2010 02:56:54 +0000 (-0200)
Subject: Avoiding duplicate definition of ssh_authorized_key
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=98e14e6257f9c15aee4994918ff2d069ed13752a;p=puppet-backupninja.git

Avoiding duplicate definition of ssh_authorized_key
---

diff --git a/manifests/server.pp b/manifests/server.pp
index a0bcbf2..b6d16b1 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -139,15 +139,17 @@ class backupninja::server {
             }
 	  }
 	  default: {
-	    @@ssh_authorized_key{ $real_user:
-	      type => $keytype,
-              key => $key,
-	      user => $real_user,
-	      target => "${real_ssh_dir}/${real_authorized_keys_file}",
-       	      tag => "$real_backuptag",
-	      require => User[$real_user],
-            }
-          }
+              if !defined(Ssh_autorized_key["$real_user"]) {
+                @@ssh_authorized_key{ "$real_user":
+                  type    => $keytype,
+                  key     => $key,
+                  user    => $real_user,
+                  target  => "${real_ssh_dir}/${real_authorized_keys_file}",
+                  tag     => "$real_backuptag",
+                  require => User[$real_user],
+                }
+              }
+     }
 	}
         case $uid {
           false: {
@@ -160,7 +162,7 @@ class backupninja::server {
                 managehome => true,
                 shell   => "/bin/sh",
                 password => '*',
-	        require => Group['backupninjas'],
+                require => Group['backupninjas'],
                 tag => "$real_backuptag"
               }
             }
@@ -176,7 +178,7 @@ class backupninja::server {
                 managehome => true,
                 shell   => "/bin/sh",
                 password => '*',
-	        require => Group['backupninjas'],
+                require => Group['backupninjas'],
                 tag => "$real_backuptag"
               }
             }