diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-16 23:51:59 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-16 23:51:59 +0000 |
| commit | ba3c8be9b2e208db197bd0b39b7dbf5f4098fb0a (patch) | |
| tree | 9bb3683c94ccdb872fb14c0c21452bf26523acb9 | |
| parent | 1813cf3020b31a3a9ceb4a61678c20b74f3137df (diff) | |
| download | puppet-ba3c8be9b2e208db197bd0b39b7dbf5f4098fb0a.tar puppet-ba3c8be9b2e208db197bd0b39b7dbf5f4098fb0a.tar.gz puppet-ba3c8be9b2e208db197bd0b39b7dbf5f4098fb0a.tar.bz2 puppet-ba3c8be9b2e208db197bd0b39b7dbf5f4098fb0a.tar.xz puppet-ba3c8be9b2e208db197bd0b39b7dbf5f4098fb0a.zip | |
create the key when we declare a ssh user
| -rw-r--r-- | modules/buildsystem/manifests/iurt/user.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/scheduler.pp | 7 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/sshuser.pp | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/buildsystem/manifests/iurt/user.pp b/modules/buildsystem/manifests/iurt/user.pp index a70c25c1..b169ee2d 100644 --- a/modules/buildsystem/manifests/iurt/user.pp +++ b/modules/buildsystem/manifests/iurt/user.pp @@ -2,7 +2,7 @@ class buildsystem::iurt::user { $login = 'iurt' $homedir = "/home/$login" - sshuser { $login: + buildsystem::sshuser { $login: homedir => $homedir, comment => 'System user used to run build bots', } diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp index 3b7e03f3..1c7a3bc1 100644 --- a/modules/buildsystem/manifests/scheduler.pp +++ b/modules/buildsystem/manifests/scheduler.pp @@ -8,12 +8,7 @@ class buildsystem::scheduler { $login = $buildsystem::scheduler::var::login $homedir = $buildsystem::scheduler::var::homedir - ssh::auth::key { $login: - # declare a key for sched bot: RSA, 2048 bits - home => $homedir, - } - - sshuser { $login: + buildsystem::sshuser { $login: homedir => $homedir, comment => 'System user used to schedule builds', } diff --git a/modules/buildsystem/manifests/sshuser.pp b/modules/buildsystem/manifests/sshuser.pp index 0a1cd176..fd703f59 100644 --- a/modules/buildsystem/manifests/sshuser.pp +++ b/modules/buildsystem/manifests/sshuser.pp @@ -33,4 +33,9 @@ define buildsystem::sshuser($homedir, $comment, $groups = []) { group => $name, require => File[$homedir], } + + ssh::auth::key { $login: + # declare a key for sched bot: RSA, 2048 bits + home => $homedir, + } } |