From d90e22b44ffb7c668cc0d00358a48c51bd6a3b4c Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Sat, 15 Feb 2020 10:29:22 -0800
Subject: [PATCH] update readme, fix some bugs

---
 Dockerfile                | 11 ++++++-----
 README.markdown           | 30 +++++++++++++++++++++++++-----
 bin/start-local-mirror.sh | 12 ------------
 mirror/syncubuntu.sh      | 10 +++++-----
 4 files changed, 36 insertions(+), 27 deletions(-)
 delete mode 100644 bin/start-local-mirror.sh

diff --git a/Dockerfile b/Dockerfile
index 22148e0..fbf8d13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,12 @@ FROM phusion/baseimage:0.11
 
 VOLUME /var/mirror
 
-ENV MIRROR_INTERVAL_SECONDS 43200
-ENV MIRROR_ARCHITECTURES amd64
-ENV UBUNTU_SOURCE_MIRROR
-ENV MIRROR_CATEGORIES main,universe,restricted,multiverse
-ENV UBUNTU_MIRROR_SOURCE archive.ubuntu.com
+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_UPSTREAM archive.ubuntu.com
 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://
diff --git a/README.markdown b/README.markdown
index e190b0f..991207e 100644
--- a/README.markdown
+++ b/README.markdown
@@ -8,29 +8,49 @@ hostname) will go fast.
 
 # Levers
 
+## Paths
+
+The mirror stores all the data in a docker volume at path
+`/var/mirror/ubuntu`.  Map that somewhere else if you like.
+
 ## Environment Variables
 
-* `MIRROR_ARCHITECTURES`
+* `UBUNTU_MIRROR_ARCHITECTURES`
     * default `amd64`.
     * You may want `i386,amd64`.
-* `MIRROR_CATEGORIES`
+* `UBUNTU_MIRROR_CATEGORIES`
     * Default `main,universe,restricted,multiverse`. Will use lots of disk.
     * You may want `main,universe`.
 * `UBUNTU_MIRROR_PROJECTS`
     * Default
       `bionic,bionic-updates,bionic-security,bionic-backports,focal,focal-updates,focal-security,focal-backports`.
     * You may want only `focal,focal-updates,focal-security,focal-backports`.
-* `UBUNTU_MIRROR_SOURCE` - upstream server to mirror from
+* `UBUNTU_MIRROR_UPSTREAM` - upstream server to mirror from
     * default `archive.ubuntu.com`.
     * You may want `xx.archive.ubuntu.com` (where `xx` is your country
       code).
-* `UBUNTU_SOURCE_MIRROR` - do we want to mirror all the source code too?
+* `UBUNTU_ENABLE_SOURCE_MIRRORING` - do we want to mirror all the source code too?
     * Default ``
     * You may want `1` if you want to use up even more disk for your mirror
-* `MIRROR_INTERVAL_SECONDS` - mirror update interval
+* `MIRROR_UPDATE_INTERVAL_SECONDS` - mirror update interval
     * default `43200` (12h)
     * You may want `10800` (3h)
 
+# Example Startup
+
+```
+docker rm -f local-ubuntu-mirror
+docker run -d --name local-ubuntu-mirror \
+	-v /storage/mirrors/ubuntu:/var/mirror/ubuntu \
+    --env MIRROR_UPDATE_INTERVAL_SECONDS=3600 \
+    --env UBUNTU_MIRROR_ARCHITECTURES=amd64 \
+    --env UBUNTU_MIRROR_UPSTREAM=us.archive.ubuntu.com \
+    --env UBUNTU_MIRROR_PROJECTS=focal,focal-updates,focal-security,focal-backports \
+	-p 8080:80 \
+	--restart unless-stopped \
+	sneak/ubuntumirror:latest
+```
+
 # Example CapRover Definition File
 
 ```
diff --git a/bin/start-local-mirror.sh b/bin/start-local-mirror.sh
deleted file mode 100644
index dcc5387..0000000
--- a/bin/start-local-mirror.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-docker rm -f local-ubuntu-mirror
-docker run -d --name local-ubuntu-mirror \
-	-v /storage/mirrors/ubuntu:/var/mirror/ubuntu \
-    --env MIRROR_INTERVAL_SECONDS=10800 \
-    --env MIRROR_ARCHITECTURES=amd64 \
-	--dns 8.8.8.8 \
-	--dns 8.8.4.4 \
-	-p 8080:80 \
-	--restart unless-stopped \
-	sneak/ubuntumirror:latest
diff --git a/mirror/syncubuntu.sh b/mirror/syncubuntu.sh
index b677849..bef17aa 100755
--- a/mirror/syncubuntu.sh
+++ b/mirror/syncubuntu.sh
@@ -12,16 +12,16 @@ mkdir -p "$DST/ubuntu"
 export GNUPGHOME="/etc/debmirror/ubuntu"
 
 SOURCEOPT="--nosource"
-if [[ ! -z "$UBUNTU_SOURCE_MIRROR" ]]; then
+if [[  "$UBUNTU_ENABLE_SOURCE_MIRRORING" != "false" ]]; then
     SOURCEOPT="--source"
 fi
 
 debmirror \
-	-a ${MIRROR_ARCHITECTURES} \
-	$SOURCEOPT \
-	-s ${MIRROR_CATEGORIES} \
-	-h ${UBUNTU_MIRROR_SOURCE} \
+	-a ${UBUNTU_MIRROR_ARCHITECTURES} \
+	-s ${UBUNTU_MIRROR_CATEGORIES} \
+	-h ${UBUNTU_MIRROR_UPSTREAM} \
 	-d ${UBUNTU_MIRROR_PROJECTS} \
+	$SOURCEOPT \
     --ignore-small-errors \
 	-r /ubuntu \
     --getcontents \