Revision

394

Author

blino

Date

2010-11-22 14:22:43 +0100 (Mon, 22 Nov 2010)

Log Message

fix sshuser definition

Modified Paths

• puppet/modules/buildsystem/manifests/init.pp

Modified: puppet/modules/buildsystem/manifests/init.pp
===================================================================
--- puppet/modules/buildsystem/manifests/init.pp	2010-11-22 13:21:17 UTC (rev 393)
+++ puppet/modules/buildsystem/manifests/init.pp	2010-11-22 13:22:43 UTC (rev 394)
@@ -39,23 +39,23 @@
 
     }
 
-    define sshuser($user, $homedir, $comment) {
-        group {"$user": 
+    define sshuser($homedir, $comment) {
+        group {"$title": 
             ensure => present,
         }
 
-        user {"$user":
+        user {"$title":
             ensure => present,
             comment => $comment,
             managehome => true,
-            gid => $user,
+            gid => $title,
             shell => "/bin/bash",
-            notify => Exec["unlock$user"],
+            notify => Exec["unlock$title"],
         }
 
         # set password to * to unlock the account but forbid login through login
-        exec { "unlock$user":
-            command => "usermod -p '*' $user",
+        exec { "unlock$title":
+            command => "usermod -p '*' $title",
             refreshonly => true,
         }
 
@@ -66,13 +66,16 @@
         file { "$homedir/.ssh":
             ensure => "directory",
             mode   => 600,
-            owner  => $user,
-            group  => $user,
+            owner  => $title,
+            group  => $title,
         }
     }
 
     class iurtuser {
-        sshuser($build_login, $build_home_dir, "System user used to run build bots")
+        sshuser { $build_login:
+          homedir => $build_home_dir,
+          comment => "System user used to run build bots",
+        }
     }
 
     class iurt {