aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-11 11:33:39 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-11 11:33:39 +0000
commit517adb146cd95239aa09dd8979ab6da02e41bbea (patch)
tree19353fd698b716a2ab75ebeb952c3a5d8fd59691
parent5d0f5ae981faf258f11fdbcd24bc50e1de05889a (diff)
downloadpuppet-517adb146cd95239aa09dd8979ab6da02e41bbea.tar
puppet-517adb146cd95239aa09dd8979ab6da02e41bbea.tar.gz
puppet-517adb146cd95239aa09dd8979ab6da02e41bbea.tar.bz2
puppet-517adb146cd95239aa09dd8979ab6da02e41bbea.tar.xz
puppet-517adb146cd95239aa09dd8979ab6da02e41bbea.zip
buildsystem::signbot: move files from templates to files directory
The following files have been moved from templates to files directory because they don't use any templating : - mga-signpackage - signbot-rpmmacros - sign-check-package
-rwxr-xr-xmodules/buildsystem/files/signbot/mga-signpackage (renamed from modules/buildsystem/templates/signbot/mga-signpackage)0
-rw-r--r--modules/buildsystem/files/signbot/sign-check-package (renamed from modules/buildsystem/templates/signbot/sign-check-package)0
-rw-r--r--modules/buildsystem/files/signbot/signbot-rpmmacros (renamed from modules/buildsystem/templates/signbot/signbot-rpmmacros)0
-rw-r--r--modules/buildsystem/manifests/signbot.pp6
4 files changed, 3 insertions, 3 deletions
diff --git a/modules/buildsystem/templates/signbot/mga-signpackage b/modules/buildsystem/files/signbot/mga-signpackage
index bd88efeb..bd88efeb 100755
--- a/modules/buildsystem/templates/signbot/mga-signpackage
+++ b/modules/buildsystem/files/signbot/mga-signpackage
diff --git a/modules/buildsystem/templates/signbot/sign-check-package b/modules/buildsystem/files/signbot/sign-check-package
index fc9704fd..fc9704fd 100644
--- a/modules/buildsystem/templates/signbot/sign-check-package
+++ b/modules/buildsystem/files/signbot/sign-check-package
diff --git a/modules/buildsystem/templates/signbot/signbot-rpmmacros b/modules/buildsystem/files/signbot/signbot-rpmmacros
index aab7e389..aab7e389 100644
--- a/modules/buildsystem/templates/signbot/signbot-rpmmacros
+++ b/modules/buildsystem/files/signbot/signbot-rpmmacros
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index 5c3e222a..2aafee76 100644
--- a/modules/buildsystem/manifests/signbot.pp
+++ b/modules/buildsystem/manifests/signbot.pp
@@ -24,11 +24,11 @@ class buildsystem::signbot {
}
file { "$home_dir/.rpmmacros":
- content => template('buildsystem/signbot/signbot-rpmmacros')
+ source => 'puppet:///modules/buildsystem/signbot/signbot-rpmmacros',
}
mga-common::local_script {
- 'sign-check-package': content => template('buildsystem/signbot/sign-check-package');
- 'mga-signpackage': content => template('buildsystem/signbot/mga-signpackage');
+ 'sign-check-package': source => 'puppet:///modules/buildsystem/signbot/sign-check-package';
+ 'mga-signpackage': source => 'puppet:///modules/buildsystem/signbot/mga-signpackage';
}
}