aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates/binrepo
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-22 22:17:02 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-22 22:17:02 +0000
commitf2c7b7e17aa798e20f5285c2e6949283e47297a2 (patch)
tree57443a99299b97fae119b7e45e3b4cd7fc203e9a /modules/buildsystem/templates/binrepo
parent77a70999df1bd4e67aadb02bd673449beae124b8 (diff)
downloadpuppet-f2c7b7e17aa798e20f5285c2e6949283e47297a2.tar
puppet-f2c7b7e17aa798e20f5285c2e6949283e47297a2.tar.gz
puppet-f2c7b7e17aa798e20f5285c2e6949283e47297a2.tar.bz2
puppet-f2c7b7e17aa798e20f5285c2e6949283e47297a2.tar.xz
puppet-f2c7b7e17aa798e20f5285c2e6949283e47297a2.zip
buildsystem: move groups definitions to var::groups
Create buildsystem::var::groups to configure packagers and packagers_committers groups, and remove buildsystem::base which is now empty.
Diffstat (limited to 'modules/buildsystem/templates/binrepo')
-rw-r--r--modules/buildsystem/templates/binrepo/sudoers.binrepo2
-rw-r--r--modules/buildsystem/templates/binrepo/wrapper.upload-bin2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/binrepo/sudoers.binrepo b/modules/buildsystem/templates/binrepo/sudoers.binrepo
index 99cfe91f..c20810cf 100644
--- a/modules/buildsystem/templates/binrepo/sudoers.binrepo
+++ b/modules/buildsystem/templates/binrepo/sudoers.binrepo
@@ -1 +1 @@
-%<%= packagers_committers_group %> ALL =(<%= scope.lookupvar('buildsystem::var::binrepo::login') %>) NOPASSWD: <%= scope.lookupvar('buildsystem::var::binrepo::uploadbinpath') %>
+%<%= scope.lookupvar('buildsystem::var::groups::packagers_committers') %> ALL =(<%= scope.lookupvar('buildsystem::var::binrepo::login') %>) NOPASSWD: <%= scope.lookupvar('buildsystem::var::binrepo::uploadbinpath') %>
diff --git a/modules/buildsystem/templates/binrepo/wrapper.upload-bin b/modules/buildsystem/templates/binrepo/wrapper.upload-bin
index bcc193fb..3def84a0 100644
--- a/modules/buildsystem/templates/binrepo/wrapper.upload-bin
+++ b/modules/buildsystem/templates/binrepo/wrapper.upload-bin
@@ -2,7 +2,7 @@
binrepouser="<%= scope.lookupvar('buildsystem::var::binrepo::login') %>"
uploadbinpath="<%= scope.lookupvar('buildsystem::var::binrepo::uploadbinpath') %>"
-packagerscommittersgroup="<%= packagers_committers_group %>"
+packagerscommittersgroup="<%= scope.lookupvar('buildsystem::var::groups::packagers_committers') %>"
function isingroup()
{