From a18f8b25e381c84c7cb467f726204d6d321ff170 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 19 Mar 2012 16:56:09 +0000
Subject: style cleaning, and various fix ( for symlink )

---
 modules/openssh/manifests/init.pp | 58 ++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'modules')

diff --git a/modules/openssh/manifests/init.pp b/modules/openssh/manifests/init.pp
index 32cc4ec9..b12a78aa 100644
--- a/modules/openssh/manifests/init.pp
+++ b/modules/openssh/manifests/init.pp
@@ -4,58 +4,60 @@ class openssh {
     class ssh_keys_from_ldap($symlink_users = [],
                              $config = '') inherits server {
 
-        File ["/etc/ssh/sshd_config"] {
-            content => template("openssh/sshd_config","openssh/sshd_config_ldap")
+        File ['/etc/ssh/sshd_config'] {
+            content => template('openssh/sshd_config','openssh/sshd_config_ldap')
         }
 
         package { 'python-ldap': }
 
-        $pubkeys_directory = "/var/lib/pubkeys"
+        $pubkeys_directory = '/var/lib/pubkeys'
         file { $pubkeys_directory:
             ensure => directory,
         }
 
         file { "$pubkeys_directory/root":
             ensure => directory,
-            mode => 700,
+            mode   => '0700',
         }
 
         file { "$pubkeys_directory/root/authorized_keys":
-            ensure => "/root/.ssh/authorized_keys",
-            mode => 700,
+            ensure => link
+            target => "/root/.ssh/authorized_keys",
+            mode   => '0700',
         }
 
         define symlink_user() {
-    	    file { "$pubkeys_directory/$name":
-	    	    ensure => directory,
-		        owner => $name,
-		        group => $name,
-		        mode => 700,
-	        }   
-
-	        file { "$pubkeys_directory/$name/authorized_keys":
-		        # FIXME : fragile approximation for $HOME
-		        ensure => "/home/$name/.ssh/authorized_keys",
-		        mode => 700,
-	        }
+            file { "$pubkeys_directory/$name":
+                ensure => directory,
+                owner  => $name,
+                group  => $name,
+                mode   => '0700',
+            }
+
+            file { "$pubkeys_directory/$name/authorized_keys":
+                # FIXME : fragile approximation for $HOME
+                ensure => link,
+                target => "/home/$name/.ssh/authorized_keys",
+                mode   => '0700',
+            }
         }
 
-        symlink_user { $symlink_users: } 
+        symlink_user { $symlink_users: }
 
-        $ldap_pwfile = "/etc/ldap.secret"
+        $ldap_pwfile = '/etc/ldap.secret'
         $ldap_servers = get_ldap_servers()
-        local_script { "ldap-sshkey2file.py":
-            content => template("openssh/ldap-sshkey2file.py"),
+        local_script { 'ldap-sshkey2file.py':
+            content => template('openssh/ldap-sshkey2file.py'),
             require => Package['python-ldap']
         }
 
         cron { 'sshkey2file':
-            command => "/usr/local/bin/ldap-sshkey2file.py",
-            hour => "*",
-            minute => "*/10",
-            user => root,
-            environment => "MAILTO=root",
-	        require => Local_script['ldap-sshkey2file.py'],
+            command     => '/usr/local/bin/ldap-sshkey2file.py',
+            hour        => '*',
+            minute      => '*/10',
+            user        => 'root',
+            environment => 'MAILTO=root',
+            require     => Local_script['ldap-sshkey2file.py'],
         }
     }
 }
-- 
cgit v1.2.1