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

Dockerfile

@@ -6,8 +6,9 @@ ENV MIRROR_UPDATE_INTERVAL_SECONDS 43200
 ENV UBUNTU_MIRROR_ARCHITECTURES amd64
 # set to anything but 'false' to mirror source code as well
 ENV UBUNTU_ENABLE_SOURCE_MIRRORING false
-ENV UBUNTU_MIRROR_CATEGORIES main,universe,restricted,multiverse
+ENV UBUNTU_MIRROR_CATEGORIES main,universe,restricted,multiverse,main/debian-installer
 ENV UBUNTU_MIRROR_UPSTREAM archive.ubuntu.com
+ENV UBUNTU_MIRROR_UPSTREAM_PATH /ubuntu
 ENV UBUNTU_MIRROR_PROJECTS bionic,bionic-updates,bionic-security,bionic-backports,focal,focal-updates,focal-security,focal-backports
 
 # The following is the URL populated in /mirrors.txt as used by mirror://

mirror/syncubuntu.sh

@@ -16,17 +16,30 @@ if [[  "$UBUNTU_ENABLE_SOURCE_MIRRORING" != "false" ]]; then
     SOURCEOPT="--source"
 fi
 
+DONE=0
+
+DIDIST="$(
+    echo -n "$UBUNTU_MIRROR_PROJECTS" | tr "," "\n" | grep -v "\-" | tr "\n" ","
+)"
+
+while [[ $DONE -eq 0 ]]; do
     debmirror \
         -a ${UBUNTU_MIRROR_ARCHITECTURES} \
         -s ${UBUNTU_MIRROR_CATEGORIES} \
         -h ${UBUNTU_MIRROR_UPSTREAM} \
         -d ${UBUNTU_MIRROR_PROJECTS} \
         $SOURCEOPT \
+        --di-dist="$DIDIST" \
+        --di-arch=arches \
         --ignore-small-errors \
-	-r /ubuntu \
+        -r "$UBUNTU_MIRROR_UPSTREAM_PATH" \
         --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;
 
@@ -30,12 +33,12 @@ http {
 
         index index.html index.htm;
 
-        #location /ubuntu/ {
+        location /ubuntu/ {
         #    # alias, not root!
         #    # trailing slash important!
         #    alias /var/mirror/ubuntu/;
-        #    autoindex on;
+            autoindex on;
-        #}
+        }
 
     }
 }