aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/manifests/signbot.pp6
-rw-r--r--modules/buildsystem/templates/submit-upload.conf2
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index a10a1e91..f832cc30 100644
--- a/modules/buildsystem/manifests/signbot.pp
+++ b/modules/buildsystem/manifests/signbot.pp
@@ -4,7 +4,7 @@ class buildsystem {
$sign_home_dir = "/var/lib/$sign_login"
$sign_keydir = "$sign_home_dir/keys"
# FIXME: maybe keyid should be defined at an other place
- $sign_keyid = "80420F66"
+ $keyid = "80420F66"
# FIXME refactor with base class ( once variables are placed in a separate module )
$sched_login = "schedbot"
@@ -28,12 +28,10 @@ class buildsystem {
}
file { "$sign_home_dir/.rpmmacros":
- mode => 644,
content => template("buildsystem/signbot/signbot-rpmmacros")
}
- file { "/usr/local/bin/sign-check-package":
- mode => 755,
+ local_script { "sign-check-package":
content => template("buildsystem/signbot/sign-check-package")
}
}
diff --git a/modules/buildsystem/templates/submit-upload.conf b/modules/buildsystem/templates/submit-upload.conf
index 03008905..5df22be1 100644
--- a/modules/buildsystem/templates/submit-upload.conf
+++ b/modules/buildsystem/templates/submit-upload.conf
@@ -206,7 +206,7 @@ actions:
options:
signuser: <%= scope.lookupvar('buildsystem::signbot::sign_login') %>
path: <%= scope.lookupvar('buildsystem::signbot::sign_keydir') %>
- name: <%= scope.lookupvar('buildsystem::signbot::sign_keyid') %>
+ name: <%= scope.lookupvar('buildsystem::signbot::keyid') %>
signscript: /usr/local/bin/sign-check-package
unpack_gfxboot_theme: