stash

deploy/dev/instance_a/domains.json

@@ -1,19 +1,3 @@
 [
-[
-  {
-    "speed": 1,
-    "position": 1
-  },
-  {
-    "speed": 1,
-    "position": 1
-  },
-    {
-    "speed": 1,
-    "position": 1
-  }
-]
-
-arr[1].speed
   "a.localhost"
 ]

deploy/dev/instance_a/nginx-a.dev.conf

@@ -14,7 +14,7 @@ http {
     }
 
     upstream dns {
-        server dns:8053;
+        server toolshed-dns:8053;
     }
 
     server {
@@ -106,17 +106,35 @@ http {
     # DoH server
     server {
         listen 5353 ssl;
-        server_name localhost;
+        server_name localhost 127.0.0.3;
 
         ssl_certificate /etc/nginx/nginx.crt;
         ssl_certificate_key /etc/nginx/nginx.key;
 
-        location /dns-query {
-            proxy_pass http://dns;
-            # allow any origin
-            add_header 'Access-Control-Allow-Origin' '*';
-            add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';
+        # Ensure CORS headers are present even when nginx generates 5xx responses.
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'Accept, Content-Type, Origin, User-Agent' always;
+        add_header 'Access-Control-Expose-Headers' 'Content-Type' always;
+        error_page 500 502 503 504 = @doh_error;
 
+        location /dns-query {
+            if ($request_method = OPTIONS) {
+                add_header 'Access-Control-Allow-Origin' '*' always;
+                add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS' always;
+                add_header 'Access-Control-Allow-Headers' 'Accept, Content-Type, Origin, User-Agent' always;
+                add_header 'Access-Control-Max-Age' 86400 always;
+                add_header 'Content-Length' 0;
+                add_header 'Content-Type' 'text/plain; charset=utf-8';
+                return 204;
+            }
+
+            proxy_pass http://dns;
+        }
+
+        location @doh_error {
+            default_type text/plain;
+            return 502 'DoH upstream unavailable';
         }
     }
 }

deploy/docker-compose.override.yml

@@ -78,3 +78,7 @@ services:
       - ./dev/zone.json:/dns/zone.json
     expose:
       - 8053
+    networks:
+      default:
+        aliases:
+          - toolshed-dns