From 6387917d8ba1b8fe14c819e916ef6f977c0d4723 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Sun, 26 May 2024 22:15:47 +0100
Subject: [PATCH] Default to 0.0.0.0 bind and allow free values

---
 README.md                                  |  6 +++---
 root/etc/s6-overlay/s6-rc.d/svc-py-kms/run | 12 +++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index d70d4dd..7b0832d 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - IP="::" #optional
+      - IP=0.0.0.0 #optional
     volumes:
       - /path/to/py-kms/config:/config
     ports:
@@ -65,7 +65,7 @@ docker run -d \
   --name=py-kms \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e IP="::" `#optional` \
+  -e IP=0.0.0.0 `#optional` \
   -e TZ=Europe/London \
   -p 1688:1688 \
   -v /path/to/py-kms/config:/config \
@@ -83,7 +83,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
-| `-e IP=` | IP address to bind to. Use `0.0.0.0` for all IPv4 interfaces. Defaults to `"::"` for all IPv6 & IPv4 interfaces. |
+| `-e IP=` | IP address to bind to. Use `0.0.0.0` for all IPv4 interfaces, use `::` for all IPv6 interfaces, or specify a full address. Note that for compose you must quote the full variable, e.g. `- "IP=0.0.0.0"` or `- "IP=::"`. |
 | `-v /config` | Contains all relevant configuration files. |
 
 ## User / Group Identifiers
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-py-kms/run b/root/etc/s6-overlay/s6-rc.d/svc-py-kms/run
index 3a456cd..831d267 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-py-kms/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-py-kms/run
@@ -1,12 +1,6 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-if [[ ${LEGACY_NET,,} = "true" ]]; then
-    exec \
-        s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT}" \
-            cd /home/py-kms s6-setuidgid abc python3 -u pykms_Server.py "0.0.0.0" "${PORT}" -l "${LCID}" -c "${CLIENT_COUNT}" -a "${ACTIVATION_INTERVAL}" -r "${RENEWAL_INTERVAL}" -w "${HWID}" -V "${LOGLEVEL}" -F "${LOGFILE}"
-else
-    exec \
-        s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT}" \
-            cd /home/py-kms s6-setuidgid abc python3 -u pykms_Server.py "${IP:-::}" "${PORT}" -l "${LCID}" -c "${CLIENT_COUNT}" -a "${ACTIVATION_INTERVAL}" -r "${RENEWAL_INTERVAL}" -w "${HWID}" -V "${LOGLEVEL}" -F "${LOGFILE}"
-fi
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${PORT}" \
+        cd /home/py-kms s6-setuidgid abc python3 -u pykms_Server.py "${IP:-0.0.0.0}" "${PORT}" -l "${LCID}" -c "${CLIENT_COUNT}" -a "${ACTIVATION_INTERVAL}" -r "${RENEWAL_INTERVAL}" -w "${HWID}" -V "${LOGLEVEL}" -F "${LOGFILE}"