diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:17 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:17 +0000 |
| commit | d4d6388339cee0803b6abb55d2415261ea6d7053 (patch) | |
| tree | b222d7c32deeedcbd09308c493c7f04980693500 /modules | |
| parent | 8a5e3ea9336b0b255d7a3c8993074d11c7d0389f (diff) | |
| download | puppet-d4d6388339cee0803b6abb55d2415261ea6d7053.tar puppet-d4d6388339cee0803b6abb55d2415261ea6d7053.tar.gz puppet-d4d6388339cee0803b6abb55d2415261ea6d7053.tar.bz2 puppet-d4d6388339cee0803b6abb55d2415261ea6d7053.tar.xz puppet-d4d6388339cee0803b6abb55d2415261ea6d7053.zip | |
split buildsystem::base in a separate file, and clean the module
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/base.pp | 21 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/init.pp | 22 |
2 files changed, 22 insertions, 21 deletions
diff --git a/modules/buildsystem/manifests/base.pp b/modules/buildsystem/manifests/base.pp new file mode 100644 index 00000000..a028c31d --- /dev/null +++ b/modules/buildsystem/manifests/base.pp @@ -0,0 +1,21 @@ +class buildsystem::base { + $build_login = 'iurt' + $build_home_dir = "/home/$build_login" + $sched_login = 'schedbot' + $sched_home_dir = "/var/lib/$sched_login" + $packages_archivedir = "$sched_home_dir/old" + $repository_root = '/distrib/bootstrap' + $packagers_group = 'mga-packagers' + $packagers_committers_group = 'mga-packagers-committers' + + include ssh::auth + ssh::auth::key { $build_login: + # declare a key for build bot: RSA, 2048 bits + home => $build_home_dir, + } + + ssh::auth::key { $sched_login: + # declare a key for sched bot: RSA, 2048 bits + home => $sched_home_dir, + } +} diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index ef8f84a7..8a3a2d3c 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -1,25 +1,5 @@ class buildsystem { - - class base { - $build_login = "iurt" - $build_home_dir = "/home/$build_login" - $sched_login = "schedbot" - $sched_home_dir = "/var/lib/$sched_login" - $packages_archivedir = "$sched_home_dir/old" - $repository_root = "/distrib/bootstrap" - $packagers_group = 'mga-packagers' - $packagers_committers_group = 'mga-packagers-committers' - - include ssh::auth - ssh::auth::key { $build_login: # declare a key for build bot: RSA, 2048 bits - home => $build_home_dir, - } - ssh::auth::key { $sched_login: # declare a key for sched bot: RSA, 2048 bits - home => $sched_home_dir, - } - } - - class mainnode inherits base { + class mainnode inherits base { include iurtuser sshuser { $sched_login: |