diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:49 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:49 +0000 |
commit | 7221579bb55dd9a571db4212fc6d994bfa182867 (patch) | |
tree | 30a2539262bafe43601d56d131aaee6223fa32d3 /modules/buildsystem/manifests | |
parent | 53a0d6357d0abfa86080fbc842608f0eaa205e60 (diff) | |
download | puppet-7221579bb55dd9a571db4212fc6d994bfa182867.tar puppet-7221579bb55dd9a571db4212fc6d994bfa182867.tar.gz puppet-7221579bb55dd9a571db4212fc6d994bfa182867.tar.bz2 puppet-7221579bb55dd9a571db4212fc6d994bfa182867.tar.xz puppet-7221579bb55dd9a571db4212fc6d994bfa182867.zip |
split rpmlint in a separate module for clarity
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/rpmlint.pp | 19 | ||||
-rw-r--r-- | modules/buildsystem/manifests/youri_submit.pp | 17 |
2 files changed, 20 insertions, 16 deletions
diff --git a/modules/buildsystem/manifests/rpmlint.pp b/modules/buildsystem/manifests/rpmlint.pp new file mode 100644 index 00000000..ea9a55b8 --- /dev/null +++ b/modules/buildsystem/manifests/rpmlint.pp @@ -0,0 +1,19 @@ +class buildsystem::rpmlint { + $sched_login = $buildsystem::base::sched_login + + package { 'rpmlint': } + + file { '/etc/rpmlint/config': + require => Package['rpmlint'], + content => template('buildsystem/rpmlint.conf') + } + + # directory that hold configuration auto extracted after upload + # of the rpmlint policy + # should belong to the scheduler user, as it need to write to it + file { '/etc/rpmlint/extracted.d/': + ensure => directory, + require => Package['rpmlint'], + owner => $sched_login, + } +} diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp index f4a7b196..4a87c8e2 100644 --- a/modules/buildsystem/manifests/youri_submit.pp +++ b/modules/buildsystem/manifests/youri_submit.pp @@ -4,6 +4,7 @@ class buildsystem::youri_submit { $packages_archivedir = "$sched_home_dir/old" include sudo + include buildsystem::rpmlint local_script { 'mga-youri-submit': @@ -17,22 +18,6 @@ class buildsystem::youri_submit { sudo::sudoers_config { 'mga-youri-submit': content => template('buildsystem/sudoers.youri') } - - package { 'rpmlint': } - - file { '/etc/rpmlint/config': - require => Package['rpmlint'], - content => template('buildsystem/rpmlint.conf') - } - - # directory that hold configuration auto extracted after upload - # of the rpmlint policy - file { '/etc/rpmlint/extracted.d/': - ensure => directory, - require => Package['rpmlint'], - owner => $sched_login, - } - # ordering is automatic : # http://docs.puppetlabs.com/learning/ordering.html#autorequire file { '/etc/youri': |