Merge lp:~nafallo/ubumirror/script-deprecation into lp:ubumirror

[Nafallo Bjälevik]

[Nafallo Bjälevik (nafallo)]

Deprecated ubudvd + fixed some wording and crontime for ubucdimage.

[Jonathan Davies (jpds)]

[r=jpds]

review: Approve (code)

=== modified file 'README'
--- README	2010-01-20 15:21:38 +0000
+++ README	2010-01-23 16:17:12 +0000
@@ -37,7 +37,6 @@
 
  + ubuarchive: sync packages from an Ubuntu archive mirror.
  + ubucdimage: sync CD images from an Ubuntu cdimage mirror (cdimage.ubuntu.com).
- + ubudvd: sync DVD images fomr an Ubuntu cdimage mirror.
  + ubuports: sync packages from an Ubuntu ports mirror (ports.ubuntu.com).
  + uburelease: sync CD images from an Ubuntu releases mirror.
 

=== modified file 'ubucdimage'
--- ubucdimage	2009-11-02 12:54:23 +0000
+++ ubucdimage	2010-01-23 16:17:12 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-#   ubucdimage - provides an easy way to sync ISO files from an Ubuntu CD
-#                image mirror.
+#   ubucdimage - provides an easy way to sync daily ISO files from an
+#                Ubuntu CD image mirror.
 #
 #   Copyright (C) 2006 - 2009 Nafallo Bjälevik
 #

=== removed file 'ubudvd'
--- ubudvd	2009-11-02 12:54:23 +0000
+++ ubudvd	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-#!/bin/sh
-#
-#   ubudvd - provides an easy way to sync DVD images from an Ubuntu DVD
-#            mirror.
-#
-#   Copyright (C) 2006 - 2009 Nafallo Bjälevik
-#
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set -e
-
-if [ ! -f /etc/ubumirror.conf ]; then
-	echo "File /etc/ubumirror.conf does not exist!"
-	exit
-fi
-
-. /etc/ubumirror.conf
-
-LOCK="${UBUDVD_DIR}/Archive-Update-in-Progress-${HOSTNAME}"
-
-# Get in the right directory and set the umask to be group writable
-cd $HOME
-umask 022
-
-# Check to see if another sync is in progress
-if ! ( set -o noclobber; echo "$$" > "${LOCK}") 2> /dev/null; then
-        if ! $(kill -0 $(cat ${LOCK}) 2>/dev/null); then
-                # Process does either not exist or is not owned by us.
-                echo "$$" > "${LOCK}"
-        else
-                echo "Unable to start rsync, lock file still exists, PID $(cat ${LOCK})."
-                exit 1
-        fi
-fi
-
-trap 'rm -f $LOCK > /dev/null 2>&1; echo "Done at $(date)" >> $LOGDIR/ubudvd.log; savelog -c 28 -n $LOGDIR/ubudvd.log > /dev/null' EXIT
-
-echo "Starting at $(date)" >> $LOGDIR/ubudvd.log
-
-set +e
-echo "Syncing ISOs..." >> $LOGDIR/ubudvd.log
-rsync -av --partial --timeout=600 \
-      --bwlimit=$SPEED \
-      $UBUDVD_EXCLUDE \
-      $UBUDVD_MIRROR $UBUDVD_DIR >> $LOGDIR/ubudvd.log 2>&1
-
-if [ $? -ne 0 ]; then
-        ( echo "Eeek. Ubuntu iso rsync broke down... Check logs.."; \
-          egrep '^write failed|@ERROR' $LOGDIR/ubudvd.log ) | mail -s "Ubuntu dvd sync failed" $EMAIL
-        echo "Eeek. Ubuntu iso rsync broke down..." >> $LOGDIR/ubudvd.log
-        exit 2
-fi
-
-echo "Done at $(date)" >> $LOGDIR/ubudvd.log
-
-rm -f $LOCK > /dev/null 2>&1
-date -u > "${UBUDVD_DIR}/.trace/${HOSTNAME}"

=== modified file 'ubumirror.conf'
--- ubumirror.conf	2009-11-01 21:15:55 +0000
+++ ubumirror.conf	2010-01-23 16:17:12 +0000
@@ -24,10 +24,6 @@
 # The script won't run if this variable isn't set
 #UBUREL_DIR="/srv/mirror/ubuntu-releases"
 
-# UBUDVD_DIR is the destination for the base of the dvd directory
-# The script won't run if this variable isn't set
-#UBUDVD_DIR="/srv/mirror/ubuntu-dvd"
-
 # UBUPOR_DIR is the destination for the base of the ports directory
 # The script (ubuports) won't run if this variable isn't set
 #UBUPOR_DIR="/srv/mirror/ubuntu-ports"
@@ -35,15 +31,14 @@
 # LOGDIR is the destination directory of all the logs
 LOGDIR="/var/log/ubumirror/"
 
-# UBU{ARC,CDI,REL,DVD}_MIRROR is the rsync path in the form of host::directory/ of the
+# UBU{ARC,CDI,REL}_MIRROR is the rsync path in the form of host::directory/ of the
 #   upstream mirrors where the ubumirror scripts will mirror from.
 UBUARC_MIRROR=archive.ubuntu.com::ubuntu/
 UBUCDI_MIRROR=cdimage.ubuntu.com::cdimage/
 UBUREL_MIRROR=rsync.releases.ubuntu.com::releases/
-UBUDVD_MIRROR=cdimage.ubuntu.com::cdimage/dvd/
 UBUPOR_MIRROR=ports.ubuntu.com::ubuntu-ports/
 
-# UBU{ARC,CDI,REL,DVD}_EXCLUDE is what things you want to exclude
+# UBU{ARC,CDI,REL}_EXCLUDE is what things you want to exclude
 UBUARC_EXCLUDE="\
 #  --exclude binary-powerpc/ --exclude binary-sparc/ \
 #  --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ \
@@ -60,10 +55,6 @@
 UBUREL_EXCLUDE="\
 #  --exclude *-powerpc.* --exclude *-sparc.* \
 "
-UBUDVD_EXCLUDE="\
-#  --exclude *-powerpc.* --exclude *-sparc.* \
-#  --exclude daily/ --exclude daily-live/ \
-"
 UBUPOR_EXCLUDE="\
 #  --exclude binary-powerpc/ --exclude binary-sparc/ \
 #  --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ \

=== modified file 'ubumirror.crontab'
--- ubumirror.crontab	2009-12-27 13:00:51 +0000
+++ ubumirror.crontab	2010-01-23 16:17:12 +0000
@@ -3,7 +3,5 @@
 03 */6 * * * ubumirror /usr/bin/ubuarchive >/dev/null
 # Update releases mirror every four hours.
 03 */4 * * * ubumirror /usr/bin/uburelease >/dev/null
-# Update cdimage mirror every seven days.
-03 11 */7 * * ubumirror /usr/bin/ubucdimage >/dev/null
-# Update dvd mirror every seven days.
-03 16 */7 * * ubumirror /usr/bin/ubudvd >/dev/null
+# Update cdimage mirror every twenty-four hours.
+03 11 * * * ubumirror /usr/bin/ubucdimage >/dev/null