diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-16 23:26:48 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-16 23:26:48 +0000 |
| commit | 1813cf3020b31a3a9ceb4a61678c20b74f3137df (patch) | |
| tree | fc5cd0c4e546cb2e414878b083f75e844e15bd24 /modules | |
| parent | e5925d5832747eac81e03c9324f405f826531cd2 (diff) | |
| download | puppet-1813cf3020b31a3a9ceb4a61678c20b74f3137df.tar puppet-1813cf3020b31a3a9ceb4a61678c20b74f3137df.tar.gz puppet-1813cf3020b31a3a9ceb4a61678c20b74f3137df.tar.bz2 puppet-1813cf3020b31a3a9ceb4a61678c20b74f3137df.tar.xz puppet-1813cf3020b31a3a9ceb4a61678c20b74f3137df.zip | |
move key creation of iurt to the iurt manifest, since that's where it belong, and clean base.pp
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/base.pp | 12 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/iurt/init.pp | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/modules/buildsystem/manifests/base.pp b/modules/buildsystem/manifests/base.pp index e93ad7b8..8befa33d 100644 --- a/modules/buildsystem/manifests/base.pp +++ b/modules/buildsystem/manifests/base.pp @@ -1,16 +1,4 @@ class buildsystem::base { - include buildsystem::scheduler::var - - $sched_login = $buildsystem::scheduler::var::login - $sched_home_dir = $buildsystem::scheduler::var::homedir - $packagers_group = 'mga-packagers' $packagers_committers_group = 'mga-packagers-committers' - - include ssh::auth - ssh::auth::key { $buildsystem::iurt::user::login: - # declare a key for build bot: RSA, 2048 bits - home => $buildsystem::iurt::user::homedir, - } - } diff --git a/modules/buildsystem/manifests/iurt/init.pp b/modules/buildsystem/manifests/iurt/init.pp index 9f5780bd..34f513cf 100644 --- a/modules/buildsystem/manifests/iurt/init.pp +++ b/modules/buildsystem/manifests/iurt/init.pp @@ -5,6 +5,12 @@ class buildsystem::iurt { $login = $buildsystem::iurt::user::login $homedir = $buildsystem::iurt::user::homedir + include ssh::auth + ssh::auth::key { $login: + # declare a key for build bot: RSA, 2048 bits + home => $homedir, + } + ssh::auth::client { $login: } ssh::auth::server { $buildsystem::base::sched_login: |