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

Proposed by Jonathan Gonzalez V.
Status: Merged
Merged at revision: 85
Proposed branch: lp:~jonathan-abdiel/ubumirror/ipv6
Merge into: lp:ubumirror
Diff against target: 37 lines (+9/-0)
2 files modified
ubuarchive (+6/-0)
ubumirror.conf (+3/-0)
To merge this branch: bzr merge lp:~jonathan-abdiel/ubumirror/ipv6
Reviewer Review Type Date Requested Status
Ubumirror Developers Pending
Review via email: mp+321645@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuarchive'
--- ubuarchive 2014-06-08 05:58:41 +0000
+++ ubuarchive 2017-04-02 12:35:02 +0000
@@ -30,6 +30,11 @@
3030
31LOGFILE="$LOGDIR/ubuarchive.log"31LOGFILE="$LOGDIR/ubuarchive.log"
3232
33PROTO="--ipv4"
34if [ "$IPV6" -eq 1 ]; then
35 PROTO="--ipv6"
36fi
37
33# Log all activity to file.38# Log all activity to file.
34exec >> $LOGFILE 2>&139exec >> $LOGFILE 2>&1
3540
@@ -68,6 +73,7 @@
68rsync -av --partial --delete --delete-after \73rsync -av --partial --delete --delete-after \
69 --timeout=$IO_TIMEOUT \74 --timeout=$IO_TIMEOUT \
70 --bwlimit=$SPEED \75 --bwlimit=$SPEED \
76 $PROTO \
71 --exclude "indices/" --exclude "dists/" --exclude "project/trace/${HOSTNAME}" \77 --exclude "indices/" --exclude "dists/" --exclude "project/trace/${HOSTNAME}" \
72 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \78 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
73 $UBUARC_EXCLUDE \79 $UBUARC_EXCLUDE \
7480
=== 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 @@
16# I/O timeout for all mirror scripts - defaults to 600 seconds.16# I/O timeout for all mirror scripts - defaults to 600 seconds.
17IO_TIMEOUT=60017IO_TIMEOUT=600
1818
19# Set to 1 to prefer IPv6 over IPv4
20IPV6=0
21
19# UBUARC_DIR is the destination for the base of the archive directory22# UBUARC_DIR is the destination for the base of the archive directory
20# The script won't run if this variable isn't set23# The script won't run if this variable isn't set
21#UBUARC_DIR="/srv/mirror/ubuntu"24#UBUARC_DIR="/srv/mirror/ubuntu"

Subscribers

People subscribed via source and target branches

to status/vote changes: