#4789 -- Listen internally to HTTP/HTTPS/SFTP ports specified in env vars.

This commit is contained in:
Buster Neece 2023-12-15 12:28:37 -06:00
parent 1c9c60bffc
commit 8d14d6d55e
No known key found for this signature in database
5 changed files with 15 additions and 19 deletions

View File

@ -19,9 +19,9 @@ services:
# Want to customize the HTTP/S ports? Follow the instructions here: # Want to customize the HTTP/S ports? Follow the instructions here:
# https://www.azuracast.com/docs/administration/docker/#using-non-standard-ports # https://www.azuracast.com/docs/administration/docker/#using-non-standard-ports
ports: ports:
- '${AZURACAST_HTTP_PORT:-80}:80' - '${AZURACAST_HTTP_PORT:-80}:${AZURACAST_HTTP_PORT:-80}'
- '${AZURACAST_HTTPS_PORT:-443}:443' - '${AZURACAST_HTTPS_PORT:-443}:${AZURACAST_HTTPS_PORT:-443}'
- '${AZURACAST_SFTP_PORT:-2022}:2022' - '${AZURACAST_SFTP_PORT:-2022}:${AZURACAST_SFTP_PORT:-2022}'
- '8000:8000' - '8000:8000'
- '8005:8005' - '8005:8005'
- '8006:8006' - '8006:8006'
@ -169,17 +169,9 @@ services:
- '8490:8490' - '8490:8490'
- '8495:8495' - '8495:8495'
- '8496:8496' - '8496:8496'
env_file: azuracast.env env_file:
environment: - azuracast.env
LANG: ${LANG:-en_US.UTF-8} - .env
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}
volumes: volumes:
- station_data:/var/azuracast/stations - station_data:/var/azuracast/stations
- backups:/var/azuracast/backups - backups:/var/azuracast/backups

View File

@ -51,8 +51,8 @@ server {
} }
server { server {
listen 80; listen {{ default .Env.AZURACAST_HTTP_PORT "80" }};
listen 443 default_server http2 ssl; 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 {{ default .Env.ACME_DIR "/var/azuracast/storage/acme" }}/ssl.crt;
ssl_certificate_key {{ default .Env.ACME_DIR "/var/azuracast/storage/acme" }}/ssl.key; ssl_certificate_key {{ default .Env.ACME_DIR "/var/azuracast/storage/acme" }}/ssl.key;

View File

@ -2,7 +2,9 @@
set -e set -e
set -x 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 cp /bd_build/web/sftpgo/sftpgo.json /var/azuracast/sftpgo/sftpgo.json

View File

@ -9,7 +9,7 @@
"pre-delete", "pre-delete",
"rename" "rename"
], ],
"hook": "http://127.0.0.1:6010/api/internal/sftp-event" "hook": "http://localhost:6010/api/internal/sftp-event"
}, },
"defender": { "defender": {
"enabled": true, "enabled": true,
@ -65,7 +65,7 @@
"driver": "bolt", "driver": "bolt",
"name": "sftpgo.db", "name": "sftpgo.db",
"users_base_dir": "/var/azuracast/stations", "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, "external_auth_scope": 0,
"auto_backup": { "auto_backup": {
"enabled": false "enabled": false

View File

@ -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 "" ssh-keygen -t ed25519 -f /var/azuracast/storage/sftpgo/id_ed25519 -q -N ""
fi 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 chown -R azuracast:azuracast /var/azuracast/storage/sftpgo