From 9b2d43722dc49df0526c4975350384abb81ad1a4 Mon Sep 17 00:00:00 2001 From: GilbN Date: Tue, 29 Mar 2022 21:33:17 +0200 Subject: [PATCH] feat: Adds TP_URLBASE env --- docker/root/defaults/default | 16 +++++++++++----- docker/root/etc/cont-init.d/50-config | 24 +++++++++++++++++++++++- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/docker/root/defaults/default b/docker/root/defaults/default index 5e698386..336c39c6 100644 --- a/docker/root/defaults/default +++ b/docker/root/defaults/default @@ -9,17 +9,23 @@ server { ssl_certificate /config/keys/cert.crt; ssl_certificate_key /config/keys/cert.key; - root /config/www; index index.html index.htm index.php; + #location#/ {return 302 $scheme://TP_DOMAIN/TP_URLBASE$request_uri;} + location / { + alias /config/www/; sub_filter_types *; - sub_filter 'https://theme-park.dev' $scheme://TP_DOMAIN; - sub_filter 'http://theme-park.dev' $scheme://TP_DOMAIN; - sub_filter 'https://develop.theme-park.dev' $scheme://TP_DOMAIN; - sub_filter 'http://develop.theme-park.dev' $scheme://TP_DOMAIN; + sub_filter 'https://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter 'http://theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter 'https://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; + sub_filter 'http://develop.theme-park.dev/' $scheme://TP_DOMAIN/TP_URLBASE/; sub_filter_once off; try_files $uri $uri/ /index.html; + + #SUBFOLDER SUBFILTERS + #sub_filter 'https://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE; + #sub_filter 'http://TP_DOMAIN' $scheme://TP_DOMAIN/TP_URLBASE; } # Don't cache diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config index e4c17df2..c0733ea0 100644 --- a/docker/root/etc/cont-init.d/50-config +++ b/docker/root/etc/cont-init.d/50-config @@ -10,6 +10,7 @@ PUID=${PUID}\\n\ PGID=${PGID}\\n\ TZ=${TZ}\\n\ TP_SCHEME=${TP_SCHEME}\\n\ +TP_URLBASE=${TP_URLBASE}\\n\ TP_DOMAIN=${TP_DOMAIN}\\n" if [[ -z ${TP_DOMAIN} ]]; then @@ -22,8 +23,29 @@ if [[ -z ${TP_SCHEME} ]]; then TP_SCHEME='https' fi +if [[ -z ${TP_URLBASE} ]]; then + TP_URLBASE='' +fi + +# Remove forward slash +case ${TP_URLBASE} in + *"/"*) + TP_URLBASE=$(echo "${TP_URLBASE}" | sed 's/\///g') + ;; +esac + DEFAULT='/defaults/default' -sed -i "s/TP_DOMAIN/${TP_DOMAIN} /g" ${DEFAULT} +if [[ ${TP_URLBASE} ]]; then + echo "seding location" + sed -i "s/location \//location \/${TP_URLBASE}/g" ${DEFAULT} + echo "seding TP_DOMAIN" + sed -i "s/TP_DOMAIN/${TP_DOMAIN}/g" ${DEFAULT} + sed -i "s/TP_URLBASE/${TP_URLBASE}/g" ${DEFAULT} + sed -i "s/#sub_filter/sub_filter/g" ${DEFAULT} + sed -i "s/#location#/location /g" ${DEFAULT} +elif [[ -z ${TP_URLBASE} ]]; then + sed -i "s/TP_DOMAIN\/TP_URLBASE/${TP_DOMAIN}/g" ${DEFAULT} +fi cp /defaults/default /config/nginx/site-confs # make our folders and links