]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
Avoiding duplicate definition of ssh_authorized_key
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 20 Feb 2010 02:56:54 +0000 (00:56 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 20 Feb 2010 02:56:54 +0000 (00:56 -0200)
manifests/server.pp

index a0bcbf26bb4019a1bd59d7ae9d8c317c7d1f0b01..b6d16b19a5fc5ed5b34146c886407cc421c3c374 100644 (file)
@@ -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"
               }
             }