From 31adbee69aa33150bd8016837b85646a948f8ad7 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 16 Mar 2012 22:46:20 +0000 Subject: move iurt.pp to a subdirectory --- modules/buildsystem/manifests/iurt.pp | 44 ------------------------------ modules/buildsystem/manifests/iurt/init.pp | 44 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 modules/buildsystem/manifests/iurt.pp create mode 100644 modules/buildsystem/manifests/iurt/init.pp diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp deleted file mode 100644 index e545f270..00000000 --- a/modules/buildsystem/manifests/iurt.pp +++ /dev/null @@ -1,44 +0,0 @@ -class buildsystem::iurt { - include sudo - include buildsystem::iurtuser - $build_login = $buildsystem::base::build_login - $build_home_dir = $buildsystem::base::build_home_dir - - ssh::auth::client { $build_login: } - ssh::auth::server { $buildsystem::base::sched_login: - user => $build_login - } - - # remove old build directory - tidy { "$build_home_dir/iurt": - age => '8w', - recurse => true, - matches => ['[0-9][0-9].*\..*\..*\.[0-9]*','log','*.rpm','*.log','*.mga[0-9]+'], - rmdirs => true, - } - -# 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)/' - package { 'iurt': } - - file { '/etc/iurt/build': - ensure => directory, - } - - define iurt_config() { - - $distribution = $name - file { "/etc/iurt/build/$distribution.conf": - owner => $buildsystem::iurt::build_login, - group => $buildsystem::iurt::build_login, - content => template("buildsystem/iurt/$distribution.conf") - } - } - - iurt_config { ['1','cauldron','mandriva2010.1','infra_1']: } - - sudo::sudoers_config { 'iurt': - content => template('buildsystem/iurt/sudoers.iurt') - } -} diff --git a/modules/buildsystem/manifests/iurt/init.pp b/modules/buildsystem/manifests/iurt/init.pp new file mode 100644 index 00000000..e545f270 --- /dev/null +++ b/modules/buildsystem/manifests/iurt/init.pp @@ -0,0 +1,44 @@ +class buildsystem::iurt { + include sudo + include buildsystem::iurtuser + $build_login = $buildsystem::base::build_login + $build_home_dir = $buildsystem::base::build_home_dir + + ssh::auth::client { $build_login: } + ssh::auth::server { $buildsystem::base::sched_login: + user => $build_login + } + + # remove old build directory + tidy { "$build_home_dir/iurt": + age => '8w', + recurse => true, + matches => ['[0-9][0-9].*\..*\..*\.[0-9]*','log','*.rpm','*.log','*.mga[0-9]+'], + rmdirs => true, + } + +# 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)/' + package { 'iurt': } + + file { '/etc/iurt/build': + ensure => directory, + } + + define iurt_config() { + + $distribution = $name + file { "/etc/iurt/build/$distribution.conf": + owner => $buildsystem::iurt::build_login, + group => $buildsystem::iurt::build_login, + content => template("buildsystem/iurt/$distribution.conf") + } + } + + iurt_config { ['1','cauldron','mandriva2010.1','infra_1']: } + + sudo::sudoers_config { 'iurt': + content => template('buildsystem/iurt/sudoers.iurt') + } +} -- cgit v1.2.1