From edc29f959423d5bb70f28e5467d067c0d890d30d Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 1 Apr 2024 19:49:23 -0300 Subject: [PATCH] Add "web-alt" entrypoint (mostly for Icecast) --- .env.sample | 17 +++++++++++------ compose.web-alt.yml | 7 +++++++ traefik.yml.tmpl | 4 ++++ 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 compose.web-alt.yml diff --git a/.env.sample b/.env.sample index e765267..0c11c44 100644 --- a/.env.sample +++ b/.env.sample @@ -60,7 +60,7 @@ COMPOSE_FILE="compose.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.wildcard.yml" ##################################################################### -# Keycloak log-in # +# Authentication # ##################################################################### ## Enable Keycloak @@ -70,6 +70,12 @@ COMPOSE_FILE="compose.yml" #KEYCLOAK_MIDDLEWARE_2_ENABLED=1 #KEYCLOAK_TFA_SERVICE_2=traefik-forward-auth_app +## BASIC_AUTH +## Use httpasswd to generate the secret +#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml" +#BASIC_AUTH=1 +#SECRET_USERSFILE_VERSION=v1 + ##################################################################### # Prometheus metrics # ##################################################################### @@ -125,11 +131,10 @@ COMPOSE_FILE="compose.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" #MATRIX_FEDERATION_ENABLED=1 -## BASIC_AUTH -## Use httpasswd to generate the secret -#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml" -#BASIC_AUTH=1 -#SECRET_USERSFILE_VERSION=v1 +## "Web alt", an alternative web port +# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this +#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml" +#WEB_ALT_ENABLED=1 ##################################################################### # Extremely insecure options, do not use # diff --git a/compose.web-alt.yml b/compose.web-alt.yml new file mode 100644 index 0000000..39e7c32 --- /dev/null +++ b/compose.web-alt.yml @@ -0,0 +1,7 @@ +version: "3.8" +services: + app: + environment: + - WEB_ALT_ENABLED + ports: + - "8000:8000" diff --git a/traefik.yml.tmpl b/traefik.yml.tmpl index f0d2e3b..1dd5def 100644 --- a/traefik.yml.tmpl +++ b/traefik.yml.tmpl @@ -48,6 +48,10 @@ entrypoints: peertube-rtmp: address: ":1935" {{ end }} + {{ if eq (env "WEB_ALT_ENABLED") "1" }} + web-alt: + address: ":8000" + {{ end }} {{ if eq (env "SSB_MUXRPC_ENABLED") "1" }} ssb-muxrpc: address: ":8008"