From 77a70999df1bd4e67aadb02bd673449beae124b8 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 22 May 2013 22:16:58 +0000
Subject: buildsystem: move binrepo config to buildsystem::var::binrepo

---
 modules/buildsystem/templates/binrepo/sudoers.binrepo    | 2 +-
 modules/buildsystem/templates/binrepo/upload-bin         | 8 ++++----
 modules/buildsystem/templates/binrepo/vhost_binrepo.conf | 2 +-
 modules/buildsystem/templates/binrepo/wrapper.upload-bin | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/buildsystem/templates/binrepo')

diff --git a/modules/buildsystem/templates/binrepo/sudoers.binrepo b/modules/buildsystem/templates/binrepo/sudoers.binrepo
index 405f43a3..99cfe91f 100644
--- a/modules/buildsystem/templates/binrepo/sudoers.binrepo
+++ b/modules/buildsystem/templates/binrepo/sudoers.binrepo
@@ -1 +1 @@
-%<%= packagers_committers_group %>      ALL =(<%= login %>) NOPASSWD: <%= uploadbinpath %>
+%<%= packagers_committers_group %>      ALL =(<%= scope.lookupvar('buildsystem::var::binrepo::login') %>) NOPASSWD: <%= scope.lookupvar('buildsystem::var::binrepo::uploadbinpath') %>
diff --git a/modules/buildsystem/templates/binrepo/upload-bin b/modules/buildsystem/templates/binrepo/upload-bin
index f90130f3..7cad5838 100755
--- a/modules/buildsystem/templates/binrepo/upload-bin
+++ b/modules/buildsystem/templates/binrepo/upload-bin
@@ -1,11 +1,11 @@
 #!/bin/sh
 set -e
 
-binrepodir=<%= repodir %>
-uploadinfosdir=<%= uploadinfosdir %>
+binrepodir=<%= scope.lookupvar('buildsystem::var::binrepo::repodir') %>
+uploadinfosdir=<%= scope.lookupvar('buildsystem::var::binrepo::uploadinfosdir') %>
 tmpfile=$(mktemp)
-mail_from="<%= uploadmail_from %>"
-mail_dest="<%= uploadmail_to %>"
+mail_from="<%= scope.lookupvar('buildsystem::var::binrepo::uploadmail_from') %>"
+mail_dest="<%= scope.lookupvar('buildsystem::var::binrepo::uploadmail_to') %>"
 
 test $# = 2 || exit 3
 username="$1"
diff --git a/modules/buildsystem/templates/binrepo/vhost_binrepo.conf b/modules/buildsystem/templates/binrepo/vhost_binrepo.conf
index ce29accf..f411c07a 100644
--- a/modules/buildsystem/templates/binrepo/vhost_binrepo.conf
+++ b/modules/buildsystem/templates/binrepo/vhost_binrepo.conf
@@ -1,3 +1,3 @@
-<Directory <%= repodir %>>
+<Directory <%= scope.lookupvar('buildsystem::var::binrepo::repodir') %>>
   Options None
 </Directory>
diff --git a/modules/buildsystem/templates/binrepo/wrapper.upload-bin b/modules/buildsystem/templates/binrepo/wrapper.upload-bin
index 48385a47..bcc193fb 100644
--- a/modules/buildsystem/templates/binrepo/wrapper.upload-bin
+++ b/modules/buildsystem/templates/binrepo/wrapper.upload-bin
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-binrepouser="<%= login %>"
-uploadbinpath="<%= uploadbinpath %>"
+binrepouser="<%= scope.lookupvar('buildsystem::var::binrepo::login') %>"
+uploadbinpath="<%= scope.lookupvar('buildsystem::var::binrepo::uploadbinpath') %>"
 packagerscommittersgroup="<%= packagers_committers_group %>"
 
 function isingroup()
-- 
cgit v1.2.1