From 8d14d6d55e2b3e1d1f845b6e8b07bb2d59a106e1 Mon Sep 17 00:00:00 2001
From: Buster Neece <buster@busterneece.com>
Date: Fri, 15 Dec 2023 12:28:37 -0600
Subject: [PATCH] #4789 -- Listen internally to HTTP/HTTPS/SFTP ports specified
 in env vars.

---
 docker-compose.sample.yml                     | 20 ++++++-------------
 util/docker/web/nginx/azuracast.conf.tmpl     |  4 ++--
 util/docker/web/setup/sftpgo.sh               |  4 +++-
 util/docker/web/sftpgo/sftpgo.json            |  4 ++--
 .../web/startup_scripts/07_sftpgo_conf.sh     |  2 ++
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml
index 3e5d3b21b..b6d8f0836 100644
--- a/docker-compose.sample.yml
+++ b/docker-compose.sample.yml
@@ -19,9 +19,9 @@ services:
     # Want to customize the HTTP/S ports? Follow the instructions here:
     # https://www.azuracast.com/docs/administration/docker/#using-non-standard-ports
     ports:
-      - '${AZURACAST_HTTP_PORT:-80}:80'
-      - '${AZURACAST_HTTPS_PORT:-443}:443'
-      - '${AZURACAST_SFTP_PORT:-2022}:2022'
+      - '${AZURACAST_HTTP_PORT:-80}:${AZURACAST_HTTP_PORT:-80}'
+      - '${AZURACAST_HTTPS_PORT:-443}:${AZURACAST_HTTPS_PORT:-443}'
+      - '${AZURACAST_SFTP_PORT:-2022}:${AZURACAST_SFTP_PORT:-2022}'
       - '8000:8000'
       - '8005:8005'
       - '8006:8006'
@@ -169,17 +169,9 @@ services:
       - '8490:8490'
       - '8495:8495'
       - '8496:8496'
-    env_file: azuracast.env
-    environment:
-      LANG: ${LANG:-en_US.UTF-8}
-      AZURACAST_DC_REVISION: 14
-      AZURACAST_VERSION: ${AZURACAST_VERSION:-latest}
-      AZURACAST_SFTP_PORT: ${AZURACAST_SFTP_PORT:-2022}
-      NGINX_TIMEOUT: ${NGINX_TIMEOUT:-1800}
-      LETSENCRYPT_HOST: ${LETSENCRYPT_HOST:-}
-      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-}
-      PUID: ${AZURACAST_PUID:-1000}
-      PGID: ${AZURACAST_PGID:-1000}
+    env_file:
+      - azuracast.env
+      - .env
     volumes:
       - station_data:/var/azuracast/stations
       - backups:/var/azuracast/backups
diff --git a/util/docker/web/nginx/azuracast.conf.tmpl b/util/docker/web/nginx/azuracast.conf.tmpl
index 73fc98620..ba4831b9d 100644
--- a/util/docker/web/nginx/azuracast.conf.tmpl
+++ b/util/docker/web/nginx/azuracast.conf.tmpl
@@ -51,8 +51,8 @@ server {
 }
 
 server {
-    listen 80;
-    listen 443 default_server http2 ssl;
+    listen {{ default .Env.AZURACAST_HTTP_PORT "80" }};
+    listen {{ default .Env.AZURACAST_HTTPS_PORT "443" }} default_server http2 ssl;
 
     ssl_certificate        {{ default .Env.ACME_DIR "/var/azuracast/storage/acme" }}/ssl.crt;
     ssl_certificate_key    {{ default .Env.ACME_DIR "/var/azuracast/storage/acme" }}/ssl.key;
diff --git a/util/docker/web/setup/sftpgo.sh b/util/docker/web/setup/sftpgo.sh
index a6e5c204f..1045c4151 100644
--- a/util/docker/web/setup/sftpgo.sh
+++ b/util/docker/web/setup/sftpgo.sh
@@ -2,7 +2,9 @@
 set -e
 set -x
 
-mkdir -p /var/azuracast/sftpgo/persist /var/azuracast/sftpgo/backups
+mkdir -p /var/azuracast/sftpgo/persist \
+  /var/azuracast/sftpgo/backups \
+  /var/azuracast/sftpgo/env.d
 
 cp /bd_build/web/sftpgo/sftpgo.json /var/azuracast/sftpgo/sftpgo.json
 
diff --git a/util/docker/web/sftpgo/sftpgo.json b/util/docker/web/sftpgo/sftpgo.json
index e8be15c66..841e4ffc8 100644
--- a/util/docker/web/sftpgo/sftpgo.json
+++ b/util/docker/web/sftpgo/sftpgo.json
@@ -9,7 +9,7 @@
         "pre-delete",
         "rename"
       ],
-      "hook": "http://127.0.0.1:6010/api/internal/sftp-event"
+      "hook": "http://localhost:6010/api/internal/sftp-event"
     },
     "defender": {
       "enabled": true,
@@ -65,7 +65,7 @@
     "driver": "bolt",
     "name": "sftpgo.db",
     "users_base_dir": "/var/azuracast/stations",
-    "external_auth_hook": "http://127.0.0.1:6010/api/internal/sftp-auth",
+    "external_auth_hook": "http://localhost:6010/api/internal/sftp-auth",
     "external_auth_scope": 0,
     "auto_backup": {
       "enabled": false
diff --git a/util/docker/web/startup_scripts/07_sftpgo_conf.sh b/util/docker/web/startup_scripts/07_sftpgo_conf.sh
index 99e93906f..c500b1e9c 100644
--- a/util/docker/web/startup_scripts/07_sftpgo_conf.sh
+++ b/util/docker/web/startup_scripts/07_sftpgo_conf.sh
@@ -12,4 +12,6 @@ if [[ ! -f /var/azuracast/storage/sftpgo/id_ed25519 ]]; then
     ssh-keygen -t ed25519 -f /var/azuracast/storage/sftpgo/id_ed25519 -q -N ""
 fi
 
+echo "SFTPGO_SFTPD__BINDINGS__0__PORT=${AZURACAST_SFTP_PORT:-2022}" > /var/azuracast/sftpgo/env.d/sftpd.env
+
 chown -R azuracast:azuracast /var/azuracast/storage/sftpgo