diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:30 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:30 +0000 |
commit | f452ec3249e85e442bb9a883208c1f814e4613bb (patch) | |
tree | d57f24e8187557d8be173b8cc9ab9ad9e688f806 /modules/buildsystem/manifests | |
parent | 6407d9853b455495c38d6cb23c8cf5c292dc088a (diff) | |
download | puppet-f452ec3249e85e442bb9a883208c1f814e4613bb.tar puppet-f452ec3249e85e442bb9a883208c1f814e4613bb.tar.gz puppet-f452ec3249e85e442bb9a883208c1f814e4613bb.tar.bz2 puppet-f452ec3249e85e442bb9a883208c1f814e4613bb.tar.xz puppet-f452ec3249e85e442bb9a883208c1f814e4613bb.zip |
move all stuff related to package archives to init.pp, since
that's used in one and only one class, youri_upload
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/base.pp | 1 | ||||
-rw-r--r-- | modules/buildsystem/manifests/init.pp | 16 | ||||
-rw-r--r-- | modules/buildsystem/manifests/mgarepo.pp | 18 |
3 files changed, 18 insertions, 17 deletions
diff --git a/modules/buildsystem/manifests/base.pp b/modules/buildsystem/manifests/base.pp index 7f7a447b..e03d9a52 100644 --- a/modules/buildsystem/manifests/base.pp +++ b/modules/buildsystem/manifests/base.pp @@ -3,7 +3,6 @@ class buildsystem::base { $sched_login = 'schedbot' $sched_home_dir = "/var/lib/$sched_login" - $packages_archivedir = "$sched_home_dir/old" $repository_root = '/distrib/bootstrap' $packagers_group = 'mga-packagers' diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index 3c0b1909..9295d12c 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -1,5 +1,8 @@ class buildsystem { class youri_submit { + + $packages_archivedir = "$sched_home_dir/old" + include sudo local_script { @@ -39,6 +42,19 @@ class buildsystem { "/etc/youri/acl.conf": content => template("buildsystem/youri_acl.conf"); } + file { $packages_archivedir: + ensure => 'directory', + owner => $sched_login, + require => File[$sched_home_dir], + } + + tidy { $packages_archivedir: + type => 'ctime', + recurse => true, + age => '1w', + matches => '*.rpm', + } + # FIXME use /usr/local/ once it will be in @INC file { '/usr/lib/perl5/vendor_perl/5.12.3/Youri/Repository/Mageia.pm': source => "puppet:///modules/buildsystem/Mageia.pm", diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index 69b73b71..0866c70c 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -1,7 +1,6 @@ class buildsystem::mgarepo { $sched_home_dir = $buildsystem::base::sched_home_dir $sched_login = $buildsystem::base::sched_login - $packages_archivedir = $buildsystem::base::packages_archivedir package { ['mgarepo','rpm-build']: } @@ -10,12 +9,6 @@ class buildsystem::mgarepo { '/etc/repsys.conf': content => template('buildsystem/mgarepo.conf'); } - file { $packages_archivedir: - ensure => 'directory', - owner => $sched_login, - require => File[$sched_home_dir], - } - file { "$sched_home_dir/repsys": ensure => 'directory', owner => $sched_login, @@ -61,17 +54,10 @@ class buildsystem::mgarepo { releases => $releases, } - Tidy { - recurse => true, - type => 'ctime', - } - tidy { "$sched_home_dir/uploads": + type => 'ctime', + recurse => true, age => '2w', } - tidy { $packages_archivedir: - age => '1w', - matches => '*.rpm', - } } |