aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/buildsystem/manifests/init.pp5
-rw-r--r--modules/buildsystem/templates/submit-upload.conf7
2 files changed, 11 insertions, 1 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index a081feda..ea2fbcaa 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -7,6 +7,9 @@ class buildsystem {
$sched_home_dir = "/var/lib/$sched_login"
$sign_login = "signbot"
$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"
$repository_root = "/distrib/bootstrap"
$packagers_group = 'mga-packagers'
$createsrpm_path = '/usr/share/repsys/create-srpm'
@@ -71,7 +74,7 @@ class buildsystem {
key_name => 'Mageia Packages',
login => $sign_login,
batchdir => "$sign_home_dir/batches",
- keydir => "$sign_home_dir/keys",
+ keydir => $sign_keydir,
}
sudo::sudoers_config { "signpackage":
diff --git a/modules/buildsystem/templates/submit-upload.conf b/modules/buildsystem/templates/submit-upload.conf
index beca119f..7a7aaf79 100644
--- a/modules/buildsystem/templates/submit-upload.conf
+++ b/modules/buildsystem/templates/submit-upload.conf
@@ -165,6 +165,13 @@ actions:
clean:
class: Youri::Submit::Action::Clean
+ sign:
+ class: Youri::Submit::Actian::Sign
+ options:
+ signuser: <%= sign_login %>
+ path: <%= sign_keydir %>
+ name: <%= sign_keyid %>
+
posts:
genhdlist2:
class: Youri::Submit::Post::Genhdlist2