diff options
author | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 11:33:34 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 11:33:34 +0000 |
commit | 813b410e0586243667434a9943e171276d740030 (patch) | |
tree | 841e3f8f87ec53a5df017b71c75de7d264a42f6b /modules/buildsystem/templates | |
parent | 1432399b47a47dc2a026c01755aa696f37997a15 (diff) | |
download | puppet-813b410e0586243667434a9943e171276d740030.tar puppet-813b410e0586243667434a9943e171276d740030.tar.gz puppet-813b410e0586243667434a9943e171276d740030.tar.bz2 puppet-813b410e0586243667434a9943e171276d740030.tar.xz puppet-813b410e0586243667434a9943e171276d740030.zip |
Create buildsystem::var::signbot
All options for buildsystem::signbot are now stored in
buildsystem::var::signbot.
Diffstat (limited to 'modules/buildsystem/templates')
-rw-r--r-- | modules/buildsystem/templates/signbot/sudoers.signpackage | 4 | ||||
-rw-r--r-- | modules/buildsystem/templates/youri/submit-upload.conf | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/buildsystem/templates/signbot/sudoers.signpackage b/modules/buildsystem/templates/signbot/sudoers.signpackage index 05653d30..2dfc30a1 100644 --- a/modules/buildsystem/templates/signbot/sudoers.signpackage +++ b/modules/buildsystem/templates/signbot/sudoers.signpackage @@ -1,2 +1,2 @@ -<%= sched_login %> ALL =(<%= login %>) NOPASSWD: /usr/local/bin/mga-signpackage -<%= sched_login %> ALL =(<%= login %>) NOPASSWD: /usr/local/bin/sign-check-package +<%= sched_login %> ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/mga-signpackage +<%= sched_login %> ALL =(<%= scope.lookupvar('buildsystem::var::signbot::login') %>) NOPASSWD: /usr/local/bin/sign-check-package diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf index 879296cb..bab096da 100644 --- a/modules/buildsystem/templates/youri/submit-upload.conf +++ b/modules/buildsystem/templates/youri/submit-upload.conf @@ -295,9 +295,9 @@ actions: sign: class: Youri::Submit::Action::Sign options: - signuser: <%= scope.lookupvar('buildsystem::signbot::login') %> - path: <%= scope.lookupvar('buildsystem::signbot::sign_keydir') %> - name: <%= scope.lookupvar('buildsystem::signbot::keyid') %> + signuser: <%= scope.lookupvar('buildsystem::var::signbot::login') %> + path: <%= scope.lookupvar('buildsystem::var::signbot::sign_keydir') %> + name: <%= scope.lookupvar('buildsystem::var::signbot::keyid') %> signscript: /usr/local/bin/sign-check-package unpack_gfxboot_theme: |