Use UPSTREAM instead of DESTINATION

2 files changed, 20 insertions, 7 deletions

diff --git a/entrypoint.sh b/entrypoint.sh
index 62cd300..92f3c1a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,12 +1,25 @@
 #!/bin/sh
 
+# Export used variables
+export HOSTNAME="${HOSTNAME:-"$(hostname -f)"}"
+export PROXY_LISTEN_PORT="${PROXY_LISTEN_PORT:-80}"
+export PROXY_UPSTREAM_HOST="${PROXY_UPSTREAM_HOST:?}"
+export PROXY_UPSTREAM_PORT="${PROXY_UPSTREAM_PORT:-80}"
+export PROXY_UPSTREAM_PROTOCOL="${PROXY_UPSTREAM_PROTOCOL:-http}"
+export PROXY_REQUEST_SIZE_MAX="${PROXY_REQUEST_SIZE_MAX:-1m}"
+
+# Print out PROXY_* variables for debugging
+env | grep '^PROXY_'
+
+# Update nginx.conf
 sed \
-	-e "s/%%PROXY_LISTEN_PORT%%/${PROXY_LISTEN_PORT:-80}/" \
-	-e "s/%%PROXY_HOSTNAME%%/${PROXY_HOSTNAME:-$(hostname -f)}/" \
-	-e "s/%%PROXY_DESTINATION_HOST%%/${PROXY_DESTINATION_HOST:?}/" \
-	-e "s/%%PROXY_DESTINATION_PORT%%/${PROXY_DESTINATION_PORT:-80}/" \
-	-e "s/%%PROXY_DESTINATION_PROTOCOL%%/${PROXY_DESTINATION_PROTOCOL:-http}/" \
-	-e "s/%%PROXY_REQUEST_SIZE_MAX%%/${PROXY_REQUEST_SIZE_MAX:-1m}/" \
+	-e "s/%%PROXY_LISTEN_PORT%%/${PROXY_LISTEN_PORT}/" \
+	-e "s/%%PROXY_HOSTNAME%%/${PROXY_HOSTNAME}/" \
+	-e "s/%%PROXY_UPSTREAM_HOST%%/${PROXY_UPSTREAM_HOST}/" \
+	-e "s/%%PROXY_UPSTREAM_PORT%%/${PROXY_UPSTREAM_PORT}/" \
+	-e "s/%%PROXY_UPSTREAM_PROTOCOL%%/${PROXY_UPSTREAM_PROTOCOL}/" \
+	-e "s/%%PROXY_REQUEST_SIZE_MAX%%/${PROXY_REQUEST_SIZE_MAX}/" \
 	< /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
 
+# Run nginx
 exec nginx -g "daemon off;"
diff --git a/nginx.conf b/nginx.conf
index cce1462..44d3293 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -24,7 +24,7 @@ http {
 
 		server_name "%%PROXY_HOSTNAME%%";
 
-		set $upstream_url "%%PROXY_DESTINATION_PROTOCOL%%://%%PROXY_DESTINATION_HOST%%:%%PROXY_DESTINATION_PORT%%";
+		set $upstream_url "%%PROXY_UPSTREAM_PROTOCOL%%://%%PROXY_UPSTREAM_HOST%%:%%PROXY_UPSTREAM_PORT%%";
 
 		location / {
 			proxy_set_header Connection $connection_upgrade;