Match DoT TLS-ALPN

hectorm · Mar 3, 2022 · a5dbad3 · a5dbad3
1 parent 1a85734
commit a5dbad3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/examples/caddy-grafana/config/caddy/Caddyfile.cue b/examples/caddy-grafana/config/caddy/Caddyfile.cue
@@ -16,7 +16,7 @@ logging: logs: {
 
 apps: {
   http: servers: {
-    main_http: {
+    http: {
       listen: [":80"]
       routes: [{
         match: [{ host: ["{$TLS_DOMAIN}"] }]
@@ -31,7 +31,7 @@ apps: {
       automatic_https: disable: true
       logs: default_logger_name: "main"
     }
-    main_https: {
+    https: {
       listen: [":443"]
       routes: [{
         match: [{ host: ["{$TLS_DOMAIN}"] }]
@@ -82,14 +82,15 @@ apps: {
     }
   }
   layer4: servers: {
-    main_dot: {
+    dot: {
       listen: [":853"]
       routes: [{
         // DNS-over-TLS endpoint
         match: [{ tls: { } }]
         handle: [{
           handler: "tls"
           connection_policies: [{
+            alpn: ["dot"]
             match: sni: ["{$TLS_DOMAIN}", ""]
             default_sni: "{$TLS_DOMAIN}"
           }]

diff --git a/examples/caddy/config/caddy/Caddyfile.cue b/examples/caddy/config/caddy/Caddyfile.cue
@@ -16,7 +16,7 @@ logging: logs: {
 
 apps: {
   http: servers: {
-    main_http: {
+    http: {
       listen: [":80"]
       routes: [{
         match: [{ host: ["{$TLS_DOMAIN}"] }]
@@ -31,7 +31,7 @@ apps: {
       automatic_https: disable: true
       logs: default_logger_name: "main"
     }
-    main_https: {
+    https: {
       listen: [":443"]
       routes: [{
         match: [{ host: ["{$TLS_DOMAIN}"] }]
@@ -72,14 +72,15 @@ apps: {
     }
   }
   layer4: servers: {
-    main_dot: {
+    dot: {
       listen: [":853"]
       routes: [{
         // DNS-over-TLS endpoint
         match: [{ tls: { } }]
         handle: [{
           handler: "tls"
           connection_policies: [{
+            alpn: ["dot"]
             match: sni: ["{$TLS_DOMAIN}", ""]
             default_sni: "{$TLS_DOMAIN}"
           }]