Add missing Nginx configuration for SSL and proxy settings

Co-authored-by: Copilot <copilot@github.com>
Update health check endpoint in verify_stack_health function in start.sh and update.sh
2026-04-28 11:17:33 +02:00 · 2026-04-28 10:55:29 +02:00 · 2026-04-26 21:38:02 +02:00 · 2026-04-26 17:01:20 +02:00
4 changed files with 35 additions and 53 deletions
@@ -1,13 +0,0 @@
-tunnel: homeserver
-credentials-file: /etc/cloudflared/credentials.json
-
-ingress:
-  # Repo 1: Inventar
-  - hostname: inventar.maximiliangruendinger.de
-    service: http://inventory-app:3000
-
-  # Repo 2: Key-Service (Buchung)
-  - hostname: booking.maximiliangruendinger.de
-    service: http://key-service-app:8080 
-
-  - service: http_status:404
@@ -13,9 +13,7 @@ services:
    image: cloudflare/cloudflared:latest
    container_name: cloudflared
    restart: unless-stopped
-    profiles:
-      - cloudflare
-    command: ["--config", "/etc/cloudflared/config.yml", "tunnel", "run"]
+    command: tunnel run homeserver  # 'homeserver' must match your tunnel name
    volumes:
      - ./docker/cloudflared/config.yml:/etc/cloudflared/config.yml:ro
      - /etc/cloudflared/credentials.json:/etc/cloudflared/credentials.json:ro
@@ -631,7 +631,7 @@ verify_stack_health() {
               printf '%s\n' "$running_services" | grep -Fxq nginx && \
               printf '%s\n' "$running_services" | grep -Fxq mongodb; then
                if docker compose "${compose_args[@]}" exec -T app python3 -c "import flask, pymongo" >/dev/null 2>&1; then
-                    if curl -kfsS "https://127.0.0.1:$HTTPS_PORT_VALUE" >/dev/null 2>&1; then
+                    if curl -kfsSL "https://127.0.0.1:$HTTPS_PORT_VALUE/health" >/dev/null 2>&1; then
                        echo "Health check passed."
                        return 0
                    fi
@@ -115,15 +115,42 @@ ensure_nginx_config_mount_source() {

    if [ ! -f "$config_path" ]; then
        cat > "$config_path" <<'EOF'
-    fi
-}
-
-server() {
+server {
    listen 80;
    server_name _;
    return 301 https://$host$request_uri;
 }

+server {
+    listen 443 ssl;
+    server_name _;
+
+    ssl_certificate /etc/nginx/certs/inventarsystem.crt;
+    ssl_certificate_key /etc/nginx/certs/inventarsystem.key;
+
+    client_max_body_size 50M;
+
+    location / {
+        proxy_pass http://app:8000;
+        proxy_http_version 1.1;
+        proxy_set_header Host $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_read_timeout 300;
+    }
+
+    error_page 500 502 503 504 /50x.html;
+    location = /50x.html {
+        default_type text/html;
+        return 200 '<!doctype html><html><head><meta charset="utf-8"><title>Server Error</title></head><body><h1>Server Error</h1><p>The service is temporarily unavailable.</p></body></html>';
+    }
+}
+EOF
+        log_message "Recreated missing nginx config at $config_path"
+    fi
+}
+
 ensure_min_root_disk_space() {
    local available_kb available_mb

@@ -183,36 +210,6 @@ cleanup_docker_dangling_images() {
    fi
 }

-server {
-    listen 443 ssl;
-    server_name _;
-
-    ssl_certificate /etc/nginx/certs/inventarsystem.crt;
-    ssl_certificate_key /etc/nginx/certs/inventarsystem.key;
-
-    client_max_body_size 50M;
-
-    location / {
-        proxy_pass http://app:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Host $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_read_timeout 300;
-    }
-
-    error_page 500 502 503 504 /50x.html;
-    location = /50x.html {
-        default_type text/html;
-        return 200 '<!doctype html><html><head><meta charset="utf-8"><title>Server Error</title></head><body><h1>Server Error</h1><p>The service is temporarily unavailable.</p></body></html>';
-    }
-}
-EOF
-        log_message "Recreated missing nginx config at $config_path"
-    fi
-}
-
 usage() {
    cat <<EOF
 Usage: $0 [options]
@@ -511,8 +508,8 @@ verify_stack_health() {
        if printf '%s\n' "$running_services" | grep -Fxq app && \
           printf '%s\n' "$running_services" | grep -Fxq nginx && \
           printf '%s\n' "$running_services" | grep -Fxq mongodb; then
-            # Primary check: HTTP endpoint responds (most reliable)
-            if curl -kfsS "https://127.0.0.1:$https_port" >/dev/null 2>&1; then
+            # Primary check: health endpoint responds (most reliable)
+            if curl -kfsSL "https://127.0.0.1:$https_port/health" >/dev/null 2>&1; then
                return 0
            fi
        fi
Author	SHA1	Message	Date
Aiirondev_dev	5a5af5375d	Add missing Nginx configuration for SSL and proxy settings Co-authored-by: Copilot <copilot@github.com>	2026-04-28 11:17:33 +02:00
Aiirondev_dev	a60eb6eebf	Update health check endpoint in verify_stack_health function in start.sh and update.sh Co-authored-by: Copilot <copilot@github.com>	2026-04-28 10:55:29 +02:00
Aiirondev_dev	23b7a4cd2f	Remove obsolete configuration file config.yml	2026-04-26 21:38:02 +02:00
Aiirondev_dev	e6fd485049	Update service configuration in config.yml and simplify cloudflared command in docker-compose	2026-04-26 17:01:20 +02:00