Modified: puppet/modules/buildsystem/manifests/init.pp
===================================================================
--- puppet/modules/buildsystem/manifests/init.pp 2010-11-21 17:42:09 UTC (rev 350)
+++ puppet/modules/buildsystem/manifests/init.pp 2010-11-21 17:46:29 UTC (rev 351)
@@ -26,11 +26,26 @@
}
+ $build_login = "iurt"
+ $build_home_dir = "/home/iurt/"
+
+ class iurtuser {
+ group {"$build_login":
+ ensure => present,
+ }
+
+ user {"$build_login":
+ ensure => present,
+ comment => "System user use to run build bots",
+ managehome => true,
+ gid => $build_login,
+ shell => "/bin/bash",
+ }
+ }
+
class iurt {
include sudo
- $home_dir = "/home/iurt/"
- $build_login = "iurt"
# build node common settings
# we could have the following skip list to use less space:
# '/(drakx-installer-binaries|drakx-installer-advertising|gfxboot|drakx-installer-stage2|mandriva-theme)/'
@@ -39,7 +54,7 @@
ensure => installed;
}
- file { "$home_dir/.iurt.cauldron.conf":
+ file { "$build_home_dir/.iurt.cauldron.conf":
ensure => present,
owner => $build_login,
group => $build_login,
@@ -54,17 +69,5 @@
mode => 440,
content => template("buildsystem/sudoers.iurt")
}
-
- group {"$build_login":
- ensure => present,
- }
-
- user {"$build_login":
- ensure => present,
- comment => "System user use to run build bots",
- managehome => true,
- gid => $build_login,
- shell => "/bin/bash",
- }
}
}