From 6a0a2f7517761e7cbef555bc294136254a3368ae Mon Sep 17 00:00:00 2001 From: GilbN Date: Sat, 26 Mar 2022 20:44:34 +0100 Subject: [PATCH] sed fix --- docker/root/defaults/default | 8 ++++---- docker/root/etc/cont-init.d/50-config | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/docker/root/defaults/default b/docker/root/defaults/default index 4388d9a3..c0e65e4d 100644 --- a/docker/root/defaults/default +++ b/docker/root/defaults/default @@ -9,10 +9,10 @@ server { location / { 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' https://TP_DOMAIN; + sub_filter 'http://theme-park.dev' http://TP_DOMAIN; + sub_filter 'https://develop.theme-park.dev' https://TP_DOMAIN; + sub_filter 'http://develop.theme-park.dev' http://TP_DOMAIN; sub_filter_once off; try_files $uri $uri/ /index.html; } diff --git a/docker/root/etc/cont-init.d/50-config b/docker/root/etc/cont-init.d/50-config index e760064a..b4664bfc 100644 --- a/docker/root/etc/cont-init.d/50-config +++ b/docker/root/etc/cont-init.d/50-config @@ -17,7 +17,16 @@ if [[ -z ${TP_DOMAIN} ]]; then TP_DOMAIN='$http_host' fi -sed -i "s/TP_DOMAIN;/${TP_DOMAIN}; /g" /defaults/default +if [[ -z ${TP_SCHEME} ]]; then + echo 'No scheme set, defaulting to https' + TP_SCHEME='https' +fi + +DEFAULT='/defaults/default' +sed -i "s/sub_filter 'https:\/\/theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} +sed -i "s/sub_filter 'http:\/\/theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} +sed -i "s/sub_filter 'https:\/\/develop.theme-park.dev' https:\/\/TP_DOMAIN;/sub_filter 'https:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} +sed -i "s/sub_filter 'http:\/\/develop.theme-park.dev' http:\/\/TP_DOMAIN;/sub_filter 'http:\/\/develop.theme-park.dev' ${TP_SCHEME}:\/\/${TP_DOMAIN}; /g" ${DEFAULT} cp /defaults/default /config/nginx/site-confs # make our folders and links