Merge branch 'next' of sneak/docker-ubuntumirror into master

mirror/syncubuntu.sh

@@ -16,17 +16,24 @@ if [[  "$UBUNTU_ENABLE_SOURCE_MIRRORING" != "false" ]]; then
     SOURCEOPT="--source"
 fi
 
-debmirror \
-	-a ${UBUNTU_MIRROR_ARCHITECTURES} \
-	-s ${UBUNTU_MIRROR_CATEGORIES} \
-	-h ${UBUNTU_MIRROR_UPSTREAM} \
-	-d ${UBUNTU_MIRROR_PROJECTS} \
-	$SOURCEOPT \
-    --ignore-small-errors \
-	-r /ubuntu \
-    --getcontents \
-	--progress \
-	--method=http \
-	$DST/ubuntu
+DONE=0
 
-chmod -R a+rX $DST
+while [[ $DONE -eq 0 ]]; do
+    debmirror \
+        -a ${UBUNTU_MIRROR_ARCHITECTURES} \
+        -s ${UBUNTU_MIRROR_CATEGORIES} \
+        -h ${UBUNTU_MIRROR_UPSTREAM} \
+        -d ${UBUNTU_MIRROR_PROJECTS} \
+        $SOURCEOPT \
+        --ignore-small-errors \
+        -r /ubuntu \
+        --getcontents \
+        --progress \
+        --method=http \
+        $DST/ubuntu
+    if [[ $? -eq 0 ]]; then
+        DONE=1
+    fi
+    chmod -R a+rX $DST
+    sleep 1
+done

nginx.conf

@@ -3,11 +3,14 @@ worker_processes auto;
 
 pid         /var/run/nginx.pid;
 
+error_log /dev/stdout info;
+
 events {
     worker_connections  1024;
 }
 
 http {
+    access_log /dev/stdout;
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;