move all stuff related to package archives to init.pp, since

that's used in one and only one class, youri_upload

1 files changed, 2 insertions, 16 deletions

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',
-    }
 }