update: Caddyfile, docker-compose(s) for reverse proxy endpoints, use…

… pdsFQDN style from pds.DOMAIN.
itaru2622 · Jan 19, 2025 · ca44cd8 · ca44cd8
1 parent ee3047a
commit ca44cd8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 22 deletions.
diff --git a/config/caddy/Caddyfile b/config/caddy/Caddyfile
@@ -113,39 +113,39 @@ http://test-ws.{$DOMAIN} {
 
 # starts: simple mapping >>>>>
 
-plc.{$DOMAIN} {
+{$plcFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://plc:2582
 }
 
-bgs.{$DOMAIN} {
+{$bgsFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://bgs:2470
 }
 
-api.{$DOMAIN}, bsky.{$DOMAIN} {
+api.{$DOMAIN}, {$bskyFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://bsky:2584
 }
 
-social-app.{$DOMAIN} {
+{$socialappFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://social-app:8100
 }
 
-ozone.{$DOMAIN} {
+{$ozoneFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
@@ -162,31 +162,31 @@ ozone-standalone.{$DOMAIN} {
 }
 
 
-palomar.{$DOMAIN} {
+{$palomarFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://palomar:3999
 }
 
-feed-generator.{$DOMAIN} {
+{$feedgenFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://feed-generator:3000
 }
 
-jetstream.{$DOMAIN} {
+{$jetstreamFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
         }
 	reverse_proxy http://jetstream:6008
 }
 
-pds.{$DOMAIN} {
+{$pdsFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand
@@ -203,8 +203,8 @@ pds.{$DOMAIN} {
 }
 # ends:  simple mapping <<<<<
 
-# starts:  *.pds.DOMAIN >>>>>>>>>>>
-*.pds.{$DOMAIN} {
+# starts:  *.pdsFQDN (pds.DOMAIN) >>>>>>>>>>>
+*.{$pdsFQDN} {
         import cors
         tls {$EMAIL4CERTS} {
           on_demand
@@ -215,56 +215,56 @@ pds.{$DOMAIN} {
         @ws {
           header Connection *Upgrade*
           header Upgrade websocket
-          header_regexp host Host ^(.*)\.pds\.{$DOMAIN}$
+          header_regexp host Host ^(.*)\.{$pdsFQDN}$
 	  path_regexp   path      ^(.*)
         }
         rewrite       @ws           {http.regexp.path.1}
         reverse_proxy @ws           http://pds:2583
 
 #---------------
-#      *.pds.DOMAIN/xrpc*  => http://pds:2583
+#      *.pdsFQDN/xrpc*  => http://pds:2583
         @xrpc {
-            header_regexp host Host ^(.*)\.pds\.{$DOMAIN}$
+            header_regexp host Host ^(.*)\.{$pdsFQDN}$
             path_regexp   path      ^(/xrpc.*)
         }
         rewrite        @xrpc        {http.regexp.path.1}
         reverse_proxy  @xrpc        http://pds:2583
 
 #---------------
-#      *.pds.DOMAIN/.well-known* => http://pds:2583
+#      *.pdsFQDN/.well-known* => http://pds:2583
         @wellknown {
-            header_regexp host Host ^(.*)\.pds\.{$DOMAIN}$
+            header_regexp host Host ^(.*)\.{$pdsFQDN}$
             path_regexp   path      ^(/\.well-known.*)
         }
         rewrite        @wellknown   {http.regexp.path.1}
         reverse_proxy  @wellknown   http://pds:2583
 
 
 #---------------
-#      *.pds.DOMAIN/robots.txt* => http://pds:2583
+#      *.pdsFQDN/robots.txt* => http://pds:2583
         @robots {
-            header_regexp host Host ^(.*)\.pds\.{$DOMAIN}$
+            header_regexp host Host ^(.*)\.{$pdsFQDN}$
             path_regexp   path      ^(/robots\.txt*)
         }
         rewrite        @robots      {http.regexp.path.1}
         reverse_proxy  @robots      http://pds:2583
 
 #---------------
-#     (.*).pds.DOMAIN/(.*) => http://social-app:8100/profile/$$1/$$2
+#     (.*).pdsFQDN/(.*) => http://social-app:8100/profile/$$1/$$2
         @others {
-            header_regexp host Host ^(.*)\.pds\.{$DOMAIN}$
+            header_regexp host Host ^(.*)\.{$pdsFQDN}$
             path_regexp   path      ^(.*)
         }
         rewrite        @others      /profile/{http.regexp.host.1}{http.regexp.path.1}
         reverse_proxy  @others      http://social-app:8100
 }
-# ends: *.pds.DOMAIN <<<<<<<<<<<
+# ends: *.pdsFQDN <<<<<<<<<<<
 
 # starts: additional (long FQDN) >>>>>>>>>
 
 # for ATP_APPVIEW_HOST=https://public.api.bsky.app in https://github.com/bluesky-social/social-app/blob/main/bskyweb/example.env
 # for https://github.com/bluesky-social/bsky-docs/issues/63
-public.api.{$DOMAIN} {
+{$publicApiFQDN} {
         import cors
 	tls {$EMAIL4CERTS} {
           on_demand

diff --git a/docker-compose-debug-caddy.yaml b/docker-compose-debug-caddy.yaml
@@ -17,6 +17,16 @@ services:
       - DOMAIN=${DOMAIN}
       - EMAIL4CERTS=${EMAIL4CERTS}
       - BSKY_ADMIN_PASSWORDS=${BSKY_ADMIN_PASSWORDS}
+      - bgsFQDN=${bgsFQDN}
+      - bskyFQDN=${bskyFQDN}
+      - feedgenFQDN=${feedgenFQDN}
+      - jetstreamFQDN=${jetstreamFQDN}
+      - ozoneFQDN=${ozoneFQDN}
+      - palomarFQDN=${palomarFQDN}
+      - pdsFQDN=${pdsFQDN}
+      - plcFQDN=${plcFQDN}
+      - publicApiFQDN=${publicApiFQDN}
+      - socialappFQDN=${socialappFQDN}
     volumes:
       - ./config/caddy/Caddyfile:/etc/caddy/Caddyfile
       # CA certificates for self-signed. >>>

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -52,6 +52,16 @@ services:
       - DOMAIN=${DOMAIN}
       - EMAIL4CERTS=${EMAIL4CERTS}
       - BSKY_ADMIN_PASSWORDS=${BSKY_ADMIN_PASSWORDS}
+      - bgsFQDN=${bgsFQDN}
+      - bskyFQDN=${bskyFQDN}
+      - feedgenFQDN=${feedgenFQDN}
+      - jetstreamFQDN=${jetstreamFQDN}
+      - ozoneFQDN=${ozoneFQDN}
+      - palomarFQDN=${palomarFQDN}
+      - pdsFQDN=${pdsFQDN}
+      - plcFQDN=${plcFQDN}
+      - publicApiFQDN=${publicApiFQDN}
+      - socialappFQDN=${socialappFQDN}
     volumes:
       - ./config/caddy/Caddyfile:/etc/caddy/Caddyfile
       # CA certificates for self-signed. >>>