aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/manifests/init.pp
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-08 14:47:12 +0000
committerMichael Scherer <misc@mageia.org>2012-01-08 14:47:12 +0000
commitf065bc7554e2bd2ea48eba299f143593520473c2 (patch)
tree665e13fa309f2bb9e9410c7c166a3a46f919b5f3 /modules/buildsystem/manifests/init.pp
parent7eeccd04686d9c28f75e5aae337e354c02a9e8f9 (diff)
downloadpuppet-f065bc7554e2bd2ea48eba299f143593520473c2.tar
puppet-f065bc7554e2bd2ea48eba299f143593520473c2.tar.gz
puppet-f065bc7554e2bd2ea48eba299f143593520473c2.tar.bz2
puppet-f065bc7554e2bd2ea48eba299f143593520473c2.tar.xz
puppet-f065bc7554e2bd2ea48eba299f143593520473c2.zip
merge the 2 declarations of local_script
Diffstat (limited to 'modules/buildsystem/manifests/init.pp')
-rw-r--r--modules/buildsystem/manifests/init.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index 9031b9cb..4cbc737a 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -157,6 +157,7 @@ class buildsystem {
local_script {
"mga-youri-submit": content => template("buildsystem/mga-youri-submit"),
"mga-youri-submit.wrapper": content => template("buildsystem/mga-youri-submit.wrapper"),
+ "submit_package": content => template('buildsystem/submit_package.pl'),
}
sudo::sudoers_config { "mga-youri-submit":
@@ -190,10 +191,6 @@ class buildsystem {
"/etc/youri/acl.conf": content => template("buildsystem/youri_acl.conf")
}
- local_script { 'submit_package':
- content => template('buildsystem/submit_package.pl')
- }
-
# FIXME use the correct perl directory
file { "/usr/lib/perl5/site_perl/5.10.1/Youri/Repository":
ensure => "directory",