[dak/master] debian/mirror: Add global definition for function name
---
config/debian/dinstall.functions | 4 ++--
config/debian/vars | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 4f6c03c..2eed7f6 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -465,7 +465,7 @@ function mirror() {
for archive in "${public_archives[@]}"; do
archiveroot="$(get_archiveroot "${archive}")"
targetpath="${mirrordir}/${archive}"
- TRACEFILE="${targetpath}/project/trace/ftp-master.debian.org"
+ TRACEFILE="${targetpath}/project/trace/${functionname}"
TRACEFILE_MASTER="${targetpath}/project/trace/master"
HIERFILE="${targetpath}/project/trace/_hierarchy"
@@ -499,7 +499,7 @@ Architectures: ${archs%* } source
EOF
cat <<EOF > ${HIERFILE}
-ftp-master.debian.org ftp-master.debian.org ${HOST} ${HOST}
+${functionname} ${functionname} ${HOST} ${HOST}
EOF
cp ${HIERFILE} ${HIERFILE}.mirror
diff --git a/config/debian/vars b/config/debian/vars
index 208ff8c..5a0866f 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -5,7 +5,8 @@ unset CDPATH
GZIP='--rsyncable --no-name' ; export GZIP
# locations used by many scripts
-base=/srv/ftp-master.debian.org
+functionname=ftp-master.debian.org
+base=/srv/${functionname}
bindir=${base}/bin
masterdir=${base}/dak/
queuedir=${base}/queue/
--
2.1.4
Reply to: