From e9e25bee119210c761df07021a43ff1a6e0a9c0a Mon Sep 17 00:00:00 2001
From: Simon Paillard <spaillard@debian.org>
Date: Mon, 12 Oct 2009 23:04:47 +0200
Subject: Update the test about debian.org machine in remaining scripts

---
 bin/runmirrors | 2 +-
 bin/websync    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/runmirrors b/bin/runmirrors
index ba181e5..a79e33d 100755
--- a/bin/runmirrors
+++ b/bin/runmirrors
@@ -62,7 +62,7 @@ PUSHDELAY=${PUSHDELAY:-600}
 # Which ssh key to use?
 KEYFILE=${KEYFILE:-".ssh/pushmirror"}
 # where to send mails to
-if [ "x$(hostname -s)x" != "x${MIRRORNAME%%.debian.org}x" ]; then
+if [ "x$(hostname -d)x" != "xdebian.orgx" ]; then
 	# We are not on a debian.org host
 	MAILTO=${MAILTO:-"root"}
 else
diff --git a/bin/websync b/bin/websync
index 086ab44..ba5ee5e 100755
--- a/bin/websync
+++ b/bin/websync
@@ -126,7 +126,7 @@ TO=${TO:-"/org/www.debian.org/www"}
 PROGRAM=${PROGRAM:-"${NAME}-$(hostname -s)"}
 
 # Where to send mails about mirroring to?
-if [ "x$(hostname -s)x" != "x${MIRRORNAME%%.debian.org}x" ]; then
+if [ "x$(hostname -d)x" != "xdebian.orgx" ]; then
 	# We are not on a debian.org host
 	MAILTO=${MAILTO:-"root"}
 else
-- 
cgit v1.2.3