Merge lp:~tribaal/ubumirror/fix-example-config-file into lp:ubumirror

[Chris Glass]

This branch simply repacks the suggested fixes to the config file (see linked bug) in an easy-to-merge format.

To test:
- Spin a fresh system up (LXC etc...)
- Install this branch (build the deb locally and dpkg -i it)
- Uncomment the UBUARC_DIR bash variable.
- Run /usr/bin/ubuarchive and assert no errors show in the log file.

=== modified file 'ubumirror.conf'
--- ubumirror.conf	2010-03-13 06:43:00 +0000
+++ ubumirror.conf	2014-06-07 08:34:32 +0000
@@ -1,5 +1,5 @@
 #
-#   ubumirror.conf - configuration file for the ubumirror scripts.
+# ubumirror.conf - configuration file for the ubumirror scripts.
 #
 
 # Please set the variables below to fit your site.
@@ -7,7 +7,8 @@
 EMAIL=root@localhost
 
 # Server's FQDN.
-HOSTNAME=$(hostname -f)
+#HOSTNAME=$(hostname -f)
+HOSTNAME=$(hostname)
 
 # Bandwidth limit for all mirror scripts - set to 0 for no limit.
 SPEED=0
@@ -32,11 +33,11 @@
 LOGDIR="/var/log/ubumirror/"
 
 # 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/
-UBUPOR_MIRROR=ports.ubuntu.com::ubuntu-ports/
+# upstream mirrors where the ubumirror scripts will mirror from.
+UBUARC_MIRROR=rsync://rsync.archive.ubuntu.com/ubuntu
+UBUCDI_MIRROR=rsync://rsync.cdimage.ubuntu.com/cdimage
+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
@@ -46,26 +47,25 @@
 "
 
 # 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/ \
-#  --exclude installer-powerpc/ --exclude installer-sparc/ \
-#  --exclude *_powerpc.deb --exclude *_powerpc.udeb \
-#  --exclude *_sparc.deb --exclude *_sparc.udeb \
-#  --exclude Contents-powerpc.gz --exclude Contents-sparc.gz \
-"
-UBUCDI_EXCLUDE="\
-#  --exclude *-powerpc.* --exclude *-sparc.* \
-#  --exclude source/ \
-"
-UBUREL_EXCLUDE="\
-#  --exclude *-powerpc.* --exclude *-sparc.* \
-"
-UBUPOR_EXCLUDE="\
-#  --exclude binary-powerpc/ --exclude binary-sparc/ \
-#  --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ \
-#  --exclude installer-powerpc/ --exclude installer-sparc/ \
-#  --exclude *_powerpc.deb --exclude *_powerpc.udeb \
-#  --exclude *_sparc.deb --exclude *_sparc.udeb \
-#  --exclude Contents-powerpc.gz --exclude Contents-sparc.gz \
-"
+UBUARC_EXCLUDE=""
+# --exclude binary-powerpc/ --exclude binary-sparc/ \
+# --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ \
+# --exclude installer-powerpc/ --exclude installer-sparc/ \
+# --exclude *_powerpc.deb --exclude *_powerpc.udeb \
+# --exclude *_sparc.deb --exclude *_sparc.udeb \
+# --exclude Contents-powerpc.gz --exclude Contents-sparc.gz \
+
+UBUCDI_EXCLUDE=""
+# --exclude *-powerpc.* --exclude *-sparc.* \
+# --exclude source/ \
+
+UBUREL_EXCLUDE=""
+# --exclude *-powerpc.* --exclude *-sparc.* \
+
+UBUPOR_EXCLUDE=""
+# --exclude binary-powerpc/ --exclude binary-sparc/ \
+# --exclude daily-installer-powerpc/ --exclude daily-installer-sparc/ \
+# --exclude installer-powerpc/ --exclude installer-sparc/ \
+# --exclude *_powerpc.deb --exclude *_powerpc.udeb \
+# --exclude *_sparc.deb --exclude *_sparc.udeb \
+# --exclude Contents-powerpc.gz --exclude Contents-sparc.gz \