diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:14 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:14 +0000 |
commit | 8a5e3ea9336b0b255d7a3c8993074d11c7d0389f (patch) | |
tree | d08f5dea45563e8ff944122c866c0ca19279cdd3 /modules/buildsystem/manifests | |
parent | e2085e64fa296d8dabccc0647162174f3fcd8858 (diff) | |
download | puppet-8a5e3ea9336b0b255d7a3c8993074d11c7d0389f.tar puppet-8a5e3ea9336b0b255d7a3c8993074d11c7d0389f.tar.gz puppet-8a5e3ea9336b0b255d7a3c8993074d11c7d0389f.tar.bz2 puppet-8a5e3ea9336b0b255d7a3c8993074d11c7d0389f.tar.xz puppet-8a5e3ea9336b0b255d7a3c8993074d11c7d0389f.zip |
some cleaning for puppetlint compliance ( but there is still some errors about scopin that need to be corrected )
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/mgarepo.pp | 125 |
1 files changed, 61 insertions, 64 deletions
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp index 29be033c..6d2b7478 100644 --- a/modules/buildsystem/manifests/mgarepo.pp +++ b/modules/buildsystem/manifests/mgarepo.pp @@ -1,76 +1,73 @@ -class buildsystem { - class mgarepo { - package { ['mgarepo','rpm-build']: } +class buildsystem::mgarepo { + package { ['mgarepo','rpm-build']: } - file { - "/etc/mgarepo.conf": content => template("buildsystem/mgarepo.conf"); - "/etc/repsys.conf": content => template("buildsystem/mgarepo.conf"); - } + file { + '/etc/mgarepo.conf': content => template('buildsystem/mgarepo.conf'); + '/etc/repsys.conf': content => template('buildsystem/mgarepo.conf'); + } - file { "$packages_archivedir": - ensure => "directory", - owner => $sched_login, - require => File[$sched_home_dir], - } + file { $packages_archivedir: + ensure => 'directory', + owner => $sched_login, + require => File[$sched_home_dir], + } - file { "$sched_home_dir/repsys": - ensure => "directory", - owner => $sched_login, - require => File[$sched_home_dir], - } + file { "$sched_home_dir/repsys": + ensure => 'directory', + owner => $sched_login, + require => File[$sched_home_dir], + } - file { ["$sched_home_dir/repsys/tmp", "$sched_home_dir/repsys/srpms"]: - ensure => "directory", - owner => $sched_login, - group => "mga-packagers", - mode => 1775, - require => File["$sched_home_dir/repsys"], - } + file { ["$sched_home_dir/repsys/tmp", "$sched_home_dir/repsys/srpms"]: + ensure => 'directory', + owner => $sched_login, + group => 'mga-packagers', + mode => '1775', + require => File["$sched_home_dir/repsys"], + } - # FIXME: disabled temporarly as upload dir is a symlink to /var/lib/repsys/uploads - #file { "$sched_home_dir/uploads": - # ensure => "directory", - # owner => $sched_login, - # require => File[$sched_home_dir], - #} + # FIXME: disabled temporarly as upload dir is a symlink to /var/lib/repsys/uploads + #file { "$sched_home_dir/uploads": + # ensure => "directory", + # owner => $sched_login, + # require => File[$sched_home_dir], + #} - #FIXME This config information should be moved out of this class - $releases = { - 'cauldron' => { - 'core' => ['release','updates_testing','backports_testing','backports','updates'], - 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'], - 'tainted' => ['release','updates_testing','backports_testing','backports','updates'], - }, - '1' => { - 'core' => ['release','updates_testing','backports_testing','backports','updates'], - 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'], - 'tainted' => ['release','updates_testing','backports_testing','backports','updates'], - }, - 'infra_1' => { - 'infra' => ['release'] - }, - } + #FIXME This config information should be moved out of this class + $releases = { + 'cauldron' => { + 'core' => ['release','updates_testing','backports_testing','backports','updates'], + 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'], + 'tainted' => ['release','updates_testing','backports_testing','backports','updates'], + }, + '1' => { + 'core' => ['release','updates_testing','backports_testing','backports','updates'], + 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'], + 'tainted' => ['release','updates_testing','backports_testing','backports','updates'], + }, + 'infra_1' => { + 'infra' => ['release'] + }, + } - import "create_upload_dir.rb" - create_upload_dir { "$sched_home_dir/uploads": - owner => $sched_login, - group => $sched_login, - releases => $releases, - } + import 'create_upload_dir.rb' + create_upload_dir { "$sched_home_dir/uploads": + owner => $sched_login, + group => $sched_login, + releases => $releases, + } - Tidy { - recurse => true, - type => "ctime", - } + Tidy { + recurse => true, + type => 'ctime', + } - tidy { "$sched_home_dir/uploads": - age => "2w", - } + tidy { "$sched_home_dir/uploads": + age => '2w', + } - tidy { "$packages_archivedir": - age => "1w", - matches => "*.rpm", - } + tidy { $packages_archivedir: + age => '1w', + matches => '*.rpm', } } - |