From 39a0491e3e152d25490496fe56a61ed14a0cd8f8 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Wed, 8 Jun 2011 15:25:45 +0000
Subject: use a define to avoid array flattening by puppet

---
 modules/openssh/manifests/init.pp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'modules/openssh')

diff --git a/modules/openssh/manifests/init.pp b/modules/openssh/manifests/init.pp
index e36f14e9..2e3fa3ae 100644
--- a/modules/openssh/manifests/init.pp
+++ b/modules/openssh/manifests/init.pp
@@ -58,19 +58,22 @@ class openssh {
             mode => 700,
         }
 
-	if $symlink_users {
-	    file { "$pubkeys_directory/$symlink_users":
-		ensure => directory,
-		owner => $symlink_users,
-		group => $symlink_users,
-		mode => 700,
-	    }
+        define symlink_user() {
+    	    file { "$pubkeys_directory/$name":
+	    	    ensure => directory,
+		        owner => $name,
+		        group => $name,
+		        mode => 700,
+	        }   
+
+	        file { "$pubkeys_directory/$name/authorized_keys":
+		        ensure => "~$name/.ssh/authorized_keys",
+		        mode => 700,
+	        }
+        }
+
+        symlink_user { $symlink_users: } 
 
-	    file { "$pubkeys_directory/$symlink_users/authorized_keys":
-		ensure => "/home/$symlink_users/.ssh/authorized_keys",
-		mode => 700,
-	    }
-	}
 
 	$sshkey2file = "/usr/local/bin/ldap-sshkey2file.py"
         $ldap_pwfile = "/etc/ldap.secret"
-- 
cgit v1.2.1