Fix health monitoring script and update nginx configuration: Ensure correct upstream port handling and set Host header to $http_host

Author: Robbie1977

health-monitor.sh

@@ -6,6 +6,11 @@
 UPSTREAM_HOST=$(echo $UPSTREAM_SERVER | cut -d: -f1)
 UPSTREAM_PORT=$(echo $UPSTREAM_SERVER | cut -d: -f2)
 
+# Default to port 80 if no port specified
+if [ "$UPSTREAM_HOST" = "$UPSTREAM_PORT" ]; then
+    UPSTREAM_PORT=80
+fi
+
 echo "Monitoring upstream server: $UPSTREAM_HOST:$UPSTREAM_PORT"
 
 while true; do

nginx.conf.template

@@ -56,7 +56,7 @@ http {
             proxy_connect_timeout 90s;
             proxy_read_timeout 90s;
             proxy_send_timeout 90s;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
@@ -91,7 +91,7 @@ http {
             proxy_connect_timeout 90s;
             proxy_read_timeout 90s;
             proxy_send_timeout 90s;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
@@ -104,4 +104,4 @@ http {
             proxy_cache owlery_cache;
         }
     }
-}
+}

nginx.conf.template.backup

@@ -0,0 +1,107 @@
+worker_processes auto;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    resolver ${DNS_RESOLVER} valid=30s;
+    resolver_timeout 5s;
+
+    upstream owlery {
+        server ${UPSTREAM_SERVER};
+        keepalive 16;
+    }
+
+    log_format cache '$remote_addr - $remote_user [$time_local] "$request" '
+                        '$status $body_bytes_sent "$http_referer" '
+                        '"$http_user_agent" "$http_x_forwarded_for" '
+                        '$upstream_cache_status $request_time $upstream_response_time';
+
+    access_log /dev/stdout cache;
+    error_log /dev/stderr warn;
+
+    proxy_cache_path /var/cache/nginx/owlery levels=1:2 keys_zone=owlery_cache:100m max_size=${CACHE_MAX_SIZE} inactive=7776000s use_temp_path=off;
+
+    proxy_cache_key "$request_method$request_uri";
+    proxy_cache_min_uses 1;
+    proxy_cache_revalidate on;
+    proxy_cache_methods GET HEAD;
+
+    proxy_cache_valid 200 7776000s;
+    proxy_cache_valid 404 600s;
+
+    proxy_cache_use_stale updating;
+    proxy_cache_background_update on;
+    proxy_cache_lock on;
+
+    server {
+        listen 80;
+
+        location /health {
+            access_log off;
+            proxy_pass http://owlery/;
+            proxy_connect_timeout 3s;
+            proxy_read_timeout 3s;
+            proxy_intercept_errors on;
+            error_page 500 502 503 504 =503 "UPSTREAM_UNAVAILABLE\n";
+            add_header Content-Type text/plain;
+            add_header X-Upstream-Status $upstream_status;
+        }
+
+        location / {
+            proxy_pass http://owlery$request_uri;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_connect_timeout 90s;
+            proxy_read_timeout 90s;
+            proxy_send_timeout 90s;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+            proxy_next_upstream_timeout 30s;
+            proxy_next_upstream_tries 2;
+            add_header X-Cache-Status $upstream_cache_status;
+            add_header X-Cache-Key "$request_method$request_uri";
+            proxy_ignore_headers Cache-Control Expires Set-Cookie;
+            proxy_cache owlery_cache;
+        }
+    }
+
+    server {
+        listen 8080;
+
+        location /health {
+            access_log off;
+            proxy_pass http://owlery/;
+            proxy_connect_timeout 3s;
+            proxy_read_timeout 3s;
+            proxy_intercept_errors on;
+            error_page 500 502 503 504 =503 "UPSTREAM_UNAVAILABLE\n";
+            add_header Content-Type text/plain;
+            add_header X-Upstream-Status $upstream_status;
+        }
+
+        location / {
+            proxy_pass http://owlery$request_uri;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_connect_timeout 90s;
+            proxy_read_timeout 90s;
+            proxy_send_timeout 90s;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+            proxy_next_upstream_timeout 30s;
+            proxy_next_upstream_tries 2;
+            add_header X-Cache-Status $upstream_cache_status;
+            add_header X-Cache-Key "$request_method$request_uri";
+            proxy_ignore_headers Cache-Control Expires Set-Cookie;
+            proxy_cache owlery_cache;
+        }
+    }
+}