summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Paillard <spaillard@debian.org>2013-09-20 22:24:14 +0200
committerSimon Paillard <spaillard@debian.org>2013-09-20 22:27:07 +0200
commit208ec0fb190de3a4a3df2f073be1d1797a386c6a (patch)
treef704fa89a19b6a8e661aa7673529ee5281d16d25
parentb44e51588a45db07cff96b754dc601ca1737524f (diff)
PROGRAM variable: hostname already included elsewhere
-rwxr-xr-xbin/ftpsync2
-rwxr-xr-xbin/runmirrors2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ftpsync b/bin/ftpsync
index f85fd28..3ec25a8 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -246,7 +246,7 @@ LOG=${LOG:-"${LOGDIR}/${NAME}.log"}
TO=${TO:-"/srv/mirrors/debian/"}
# used by log() and error()
-PROGRAM=${PROGRAM:-"${NAME}-$(hostname -s)"}
+PROGRAM=${PROGRAM:-"${NAME}"}
# Where to send mails about mirroring to?
if [ "x$(hostname -d)x" != "xdebian.orgx" ]; then
diff --git a/bin/runmirrors b/bin/runmirrors
index 53f97ff..93922b6 100755
--- a/bin/runmirrors
+++ b/bin/runmirrors
@@ -108,7 +108,7 @@ LOGROTATE=${LOGROTATE:-14}
# Our mirrorfile
MIRRORS=${MIRRORS:-"${BASEDIR}/etc/${NAME}.mirror"}
# used by log()
-PROGRAM=${PROGRAM:-"${NAME}-$(hostname -s)"}
+PROGRAM=${PROGRAM:-"${NAME}"}
# extra ssh options we might want hostwide
SSH_OPTS=${SSH_OPTS:-"-o StrictHostKeyChecking=no"}
# Whats our archive name? We will also tell our leafs about it