diff options
Diffstat (limited to 'modules/buildsystem/manifests/iurt')
-rw-r--r-- | modules/buildsystem/manifests/iurt/config.pp | 3 | ||||
-rw-r--r-- | modules/buildsystem/manifests/iurt/upload.pp | 5 | ||||
-rw-r--r-- | modules/buildsystem/manifests/iurt/user.pp | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp index 88c08b66..1d75c32e 100644 --- a/modules/buildsystem/manifests/iurt/config.pp +++ b/modules/buildsystem/manifests/iurt/config.pp @@ -1,7 +1,8 @@ define buildsystem::iurt::config() { + include buildsystem::var::iurt $distribution = $name # TODO rename the variable too in template - $build_login = $buildsystem::iurt::user::login + $build_login = $buildsystem::var::iurt::login file { "/etc/iurt/build/$distribution.conf": owner => $build_login, diff --git a/modules/buildsystem/manifests/iurt/upload.pp b/modules/buildsystem/manifests/iurt/upload.pp index 187c3bb8..94921223 100644 --- a/modules/buildsystem/manifests/iurt/upload.pp +++ b/modules/buildsystem/manifests/iurt/upload.pp @@ -1,8 +1,5 @@ class buildsystem::iurt::upload { - $login = $buildsystem::iurt::user::login - $homedir = $buildsystem::iurt::user::homedir - $sched_login = $buildsystem::var::scheduler::login - + include buildsystem::var::iurt file { '/etc/iurt/upload.conf': require => File['/etc/iurt'], content => template('buildsystem/upload.conf'), diff --git a/modules/buildsystem/manifests/iurt/user.pp b/modules/buildsystem/manifests/iurt/user.pp index b169ee2d..0da84743 100644 --- a/modules/buildsystem/manifests/iurt/user.pp +++ b/modules/buildsystem/manifests/iurt/user.pp @@ -1,9 +1,8 @@ class buildsystem::iurt::user { - $login = 'iurt' - $homedir = "/home/$login" + include buildsystem::var::iurt - buildsystem::sshuser { $login: - homedir => $homedir, + buildsystem::sshuser { $buildsystem::var::iurt::login: + homedir => $buildsystem::var::iurt::homedir, comment => 'System user used to run build bots', } |