Merge lp:~tribaal/ubumirror/cdimage-normalisation into lp:ubumirror

[Chris Glass]

This makes the cdimage script behave like the others - sync everything by default and rely on the ocmmon blacklist ("exclude" parameters) to filter out content not to be synced.

=== modified file 'ubucdimage'
--- ubucdimage	2014-06-08 05:58:41 +0000
+++ ubucdimage	2014-06-09 07:26:27 +0000
@@ -64,32 +64,25 @@
 
 set +e
 
-if [ -z "$UBUCDI_FLAVOURS" ]; then
-    echo Please define UBUCDI_FLAVOURS in /etc/ubumirror.conf
-    exit 1
+echo "$(date -R): Initiating cdimage sync..."
+
+mkdir -p $UBUCDI_DIR
+
+rsync -av --partial \
+    --timeout=$IO_TIMEOUT \
+    --bwlimit=$SPEED \
+    --exclude ".trace/${HOSTNAME}" \
+    $UBUCDI_EXCLUDE \
+    $UBUCDI_MIRROR $UBUCDI_DIR
+
+if [ $? -ne 0 ]; then
+    ( echo "Sync for $FLAVOUR failed. Please check logs."; \
+        egrep '^write failed|@ERROR' $LOGFILE ) | mail -s "Ubuntu cdimage sync failed" $EMAIL
+    echo "$(date -R): sync for cdimage failed."
+    exit 2
 fi
 
-for FLAVOUR in $UBUCDI_FLAVOURS; do 
-    echo "$(date -R): Initiating sync for $FLAVOUR..."
-
-    mkdir -p $UBUCDI_DIR/$FLAVOUR
-
-    rsync -av --partial \
-        --timeout=$IO_TIMEOUT \
-        --bwlimit=$SPEED \
-        --exclude ".trace/${HOSTNAME}" \
-        $UBUCDI_EXCLUDE \
-        $UBUCDI_MIRROR/$FLAVOUR/current/ $UBUCDI_DIR/$FLAVOUR
-
-    if [ $? -ne 0 ]; then
-        ( echo "Sync for $FLAVOUR failed. Please check logs."; \
-            egrep '^write failed|@ERROR' $LOGFILE ) | mail -s "Ubuntu cdimage $FLAVOUR sync failed" $EMAIL
-        echo "$(date -R): sync for $FLAVOUR failed."
-        exit 2
-    fi
-
-    echo "$(date -R): sync for $FLAVOUR completed."
-done
+echo "$(date -R): sync for cdimage completed."
 
 rm -f $LOCK > /dev/null 2>&1
 

=== modified file 'ubumirror.conf'
--- ubumirror.conf	2014-06-08 09:07:26 +0000
+++ ubumirror.conf	2014-06-09 07:26:27 +0000
@@ -42,13 +42,6 @@
 UBUREL_MIRROR=rsync://rsync.releases.ubuntu.com/releases
 UBUPOR_MIRROR=rsync://rsync.ports.ubuntu.com/ubuntu-ports
 
-# UBUCDI_FLAVOURS is the set of image flavours to pull from UBICDI_MIRROR
-# flavour names must match directory names on the mirror
-UBUCDI_FLAVOURS="\
-  daily daily-live \
-  ubuntu-netbook/daily-live ubuntu-server/daily \
-"
-
 # UBU{ARC,CDI,REL}_EXCLUDE is what things you want to exclude
 UBUARC_EXCLUDE=""
 # --exclude binary-powerpc/ --exclude binary-sparc/ \