Merge lp:~jonathan-abdiel/ubumirror/ipv6 into lp:ubumirror

[Jonathan Gonzalez V.]

=== modified file 'ubuarchive'
--- ubuarchive	2014-06-08 05:58:41 +0000
+++ ubuarchive	2017-04-02 12:35:02 +0000
@@ -30,6 +30,11 @@
 
 LOGFILE="$LOGDIR/ubuarchive.log"
 
+PROTO="--ipv4"
+if [ "$IPV6" -eq 1 ]; then
+   PROTO="--ipv6"
+fi
+
 # Log all activity to file.
 exec >> $LOGFILE 2>&1
 
@@ -68,6 +73,7 @@
 rsync -av --partial --delete --delete-after \
       --timeout=$IO_TIMEOUT \
       --bwlimit=$SPEED \
+      $PROTO \
       --exclude "indices/" --exclude "dists/" --exclude "project/trace/${HOSTNAME}" \
       --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
       $UBUARC_EXCLUDE \

=== modified file 'ubumirror.conf'
--- ubumirror.conf	2014-08-15 07:45:45 +0000
+++ ubumirror.conf	2017-04-02 12:35:02 +0000
@@ -16,6 +16,9 @@
 # I/O timeout for all mirror scripts - defaults to 600 seconds.
 IO_TIMEOUT=600
 
+# Set to 1 to prefer IPv6 over IPv4
+IPV6=0
+
 # UBUARC_DIR is the destination for the base of the archive directory
 # The script won't run if this variable isn't set
 #UBUARC_DIR="/srv/mirror/ubuntu"