diff options
| author | booo <borgers@mi.fu-berlin.de> | 2012-09-27 11:15:33 +0200 |
|---|---|---|
| committer | booo <borgers@mi.fu-berlin.de> | 2012-09-27 11:15:33 +0200 |
| commit | 3986470702fcbc894fce8e4cd61214116be8f558 (patch) | |
| tree | 30a76281f4184b8e620fa846140e032bcfc21a31 | |
| parent | a5274464ccb7df68b8b154511b03ce94df324b69 (diff) | |
| download | mirror-sync-3986470702fcbc894fce8e4cd61214116be8f558.tar.gz mirror-sync-3986470702fcbc894fce8e4cd61214116be8f558.tar.bz2 mirror-sync-3986470702fcbc894fce8e4cd61214116be8f558.zip | |
Retab sync-osm.
| -rwxr-xr-x | bin/sync-osm-planet.sh | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/bin/sync-osm-planet.sh b/bin/sync-osm-planet.sh index 2bea5e6..01354d7 100755 --- a/bin/sync-osm-planet.sh +++ b/bin/sync-osm-planet.sh @@ -4,27 +4,27 @@ RSYNC="/usr/bin/rsync" SRC="rsync://planet.openstreetmap.org/planet/" DST="/mirror/ftp/pub/openstreetmap/" RSYNC_OPTS=( - "-Hax" - "--delete" - "--delete-excluded" + "-Hax" + "--delete" + "--delete-excluded" "--include=planet/" "--include=planet/$(date +%Y)/" "--include=pbf/" - "--include=*-$(date +%y%m)*" - "--include=*-$(date -d '-1month' +%y%m)*" - "--include=*-$(date -d '-2month' +%y%m)*" - "--include=*-$(date -d '-3month' +%y%m)*" - "--include=*-latest*" - "--exclude=*" - "--filter=protect torrents/" - #"--list-only" - ) + "--include=*-$(date +%y%m)*" + "--include=*-$(date -d '-1month' +%y%m)*" + "--include=*-$(date -d '-2month' +%y%m)*" + "--include=*-$(date -d '-3month' +%y%m)*" + "--include=*-latest*" + "--exclude=*" + "--filter=protect torrents/" + #"--list-only" + ) MKTORRENT="/usr/bin/mktorrent" TRACKER=( - "http://tracker.ipv6tracker.org:80/announce,udp://tracker.ipv6tracker.org:80/announce" - "udp://tracker.publicbt.com:80/announce,http://tracker.publicbt.com:80/announce" - "udp://tracker.openbittorrent.com:80/announce" ) + "http://tracker.ipv6tracker.org:80/announce,udp://tracker.ipv6tracker.org:80/announce" + "udp://tracker.publicbt.com:80/announce,http://tracker.publicbt.com:80/announce" + "udp://tracker.openbittorrent.com:80/announce" ) MKTORRENT_OPTS=( "-l 22" ) ${RSYNC} "${RSYNC_OPTS[@]}" ${SRC} ${DST} @@ -32,32 +32,32 @@ ${RSYNC} "${RSYNC_OPTS[@]}" ${SRC} ${DST} # create torrents #for file in ${DST}/*.bz2 #do -# archiv="$(basename $file)" -# if [ ! -L ${file} ] -# then -# torrent="${DST}/torrents/${archiv}.torrent" -# torrent_tmp="/tmp/${archiv}.torrent" +# archiv="$(basename $file)" +# if [ ! -L ${file} ] +# then +# torrent="${DST}/torrents/${archiv}.torrent" +# torrent_tmp="/tmp/${archiv}.torrent" # -# if [ ! -e "${torrent}" ] -# then -# rm -f "${torrent_tmp}" +# if [ ! -e "${torrent}" ] +# then +# rm -f "${torrent_tmp}" # -# TRACKER_OPT="" -# for t in "${TRACKER[@]}" -# do -# TRACKER_OPT="${TRACKER_OPT} -a ${t}" -# done +# TRACKER_OPT="" +# for t in "${TRACKER[@]}" +# do +# TRACKER_OPT="${TRACKER_OPT} -a ${t}" +# done # -# ${MKTORRENT} ${TRACKER_OPT} "${MKTORRENT_OPTS[@]}" \ -# -w "http://ftp.spline.inf.fu-berlin.de/pub/openstreetmap/${archiv}" \ -# -w "http://planet.osm.org/${archiv}" \ -# "${file}" -o "${torrent_tmp}" > /dev/null && \ -# mv "${torrent_tmp}" "${torrent}" -# fi -# else -# target="$(readlink ${file})" -# ln -sf "$(basename ${target}).torrent" "${DST}/torrents/${archiv}.torrent" -# fi +# ${MKTORRENT} ${TRACKER_OPT} "${MKTORRENT_OPTS[@]}" \ +# -w "http://ftp.spline.inf.fu-berlin.de/pub/openstreetmap/${archiv}" \ +# -w "http://planet.osm.org/${archiv}" \ +# "${file}" -o "${torrent_tmp}" > /dev/null && \ +# mv "${torrent_tmp}" "${torrent}" +# fi +# else +# target="$(readlink ${file})" +# ln -sf "$(basename ${target}).torrent" "${DST}/torrents/${archiv}.torrent" +# fi #done echo "End: $(date)" |