From: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu, 3 Oct 2019 20:55:26 +0000 (+0200)
Subject: staticsync: let's assume that IPv6 is not worse than IPv4
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a4f23b2b8214a8dc052ba3cadfd7b733cc809817;p=mirror%2Fdsa-puppet.git

staticsync: let's assume that IPv6 is not worse than IPv4
---

diff --git a/modules/staticsync/files/static-mirror-run b/modules/staticsync/files/static-mirror-run
index eac646bb3..266baaae6 100755
--- a/modules/staticsync/files/static-mirror-run
+++ b/modules/staticsync/files/static-mirror-run
@@ -66,7 +66,7 @@ COMPONENT="$(basename "${COMPONENTDIR}")"
 
 RSYNC="rsync"
 RSYNC_BASE_OPTIONS="-rtvz --delete --links --hard-links --safe-links"
-RSYNC_SSH_OPTIONS="ssh -o AddressFamily=inet -o BatchMode=yes"
+RSYNC_SSH_OPTIONS="ssh -o BatchMode=yes"
 
 LOGDIR="$HOME/logs"
 LOGFILE="$LOGDIR/$NAME-run-${COMPONENT}.log"
diff --git a/modules/staticsync/files/static-update-component b/modules/staticsync/files/static-update-component
index 455d17d38..7b6a3b5a2 100755
--- a/modules/staticsync/files/static-update-component
+++ b/modules/staticsync/files/static-update-component
@@ -80,7 +80,7 @@ fi
 if [ "`id -nu`" != "$staticuser" ]; then
   sudo -u "$staticuser" static-update-component "$@"
 else
-  ssh -o AddressFamily=inet -t -t -o ServerAliveInterval=300 -o PreferredAuthentications=publickey "$masterhost" static-master-update-component "$component"
+  ssh -t -t -o ServerAliveInterval=300 -o PreferredAuthentications=publickey "$masterhost" static-master-update-component "$component"
 fi
 
 # vim:set et: