diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:37 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-16 22:46:37 +0000 |
| commit | 8653753a27a8b67ff91be5d82f497f3d6c7f2746 (patch) | |
| tree | 450a0775f9edab1220a3a37e45000535117ab2a5 /modules/buildsystem/templates | |
| parent | b1dfebfc86261d66e43a71a71d7f63cfa3dec9dc (diff) | |
| download | puppet-8653753a27a8b67ff91be5d82f497f3d6c7f2746.tar puppet-8653753a27a8b67ff91be5d82f497f3d6c7f2746.tar.gz puppet-8653753a27a8b67ff91be5d82f497f3d6c7f2746.tar.bz2 puppet-8653753a27a8b67ff91be5d82f497f3d6c7f2746.tar.xz puppet-8653753a27a8b67ff91be5d82f497f3d6c7f2746.zip | |
clean binrepo module for puppet-lint compliance
Diffstat (limited to 'modules/buildsystem/templates')
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/buildsystem/templates/binrepo/sudoers.binrepo b/modules/buildsystem/templates/binrepo/sudoers.binrepo index 7a9efef4..405f43a3 100644 --- a/modules/buildsystem/templates/binrepo/sudoers.binrepo +++ b/modules/buildsystem/templates/binrepo/sudoers.binrepo @@ -1 +1 @@ -%<%= packagers_committers_group %> ALL =(<%= binrepo_login %>) NOPASSWD: <%= uploadbinpath %> +%<%= packagers_committers_group %> ALL =(<%= login %>) NOPASSWD: <%= uploadbinpath %> diff --git a/modules/buildsystem/templates/binrepo/upload-bin b/modules/buildsystem/templates/binrepo/upload-bin index ef64a1a3..c67f045a 100755 --- a/modules/buildsystem/templates/binrepo/upload-bin +++ b/modules/buildsystem/templates/binrepo/upload-bin @@ -1,5 +1,5 @@ #!/bin/sh -binrepodir=<%= binrepodir %> +binrepodir=<%= repodir %> uploadinfosdir=<%= uploadinfosdir %> tmpfile=$(mktemp) mail_from="<%= uploadmail_from %>" diff --git a/modules/buildsystem/templates/binrepo/vhost_binrepo.conf b/modules/buildsystem/templates/binrepo/vhost_binrepo.conf index 8206614f..ce29accf 100644 --- a/modules/buildsystem/templates/binrepo/vhost_binrepo.conf +++ b/modules/buildsystem/templates/binrepo/vhost_binrepo.conf @@ -1,3 +1,3 @@ -<Directory <%= binrepodir %>> +<Directory <%= repodir %>> Options None </Directory> diff --git a/modules/buildsystem/templates/binrepo/wrapper.upload-bin b/modules/buildsystem/templates/binrepo/wrapper.upload-bin index 4e79e494..48385a47 100644 --- a/modules/buildsystem/templates/binrepo/wrapper.upload-bin +++ b/modules/buildsystem/templates/binrepo/wrapper.upload-bin @@ -1,6 +1,6 @@ #!/bin/sh -binrepouser="<%= binrepo_login %>" +binrepouser="<%= login %>" uploadbinpath="<%= uploadbinpath %>" packagerscommittersgroup="<%= packagers_committers_group %>" |