refactor caddyfile

caddy/Caddyfile

···
   }
 }
 
-{$HOST:localhost} {
-  log prs {
-    output stdout
-    format console
-  }
-  
-  reverse_proxy prs:4321
-}
-
-# redirect www. to not www.
-www.{$HOST:localhost} {
-  redir https://{$HOST:localhost}{uri}
-}
-
-http://dongs.zip {
-  redir https://dongs.zip{uri}
-}
-
-https://dongs.zip {
-  log dong {
-    output stdout
-    format console
-  }
-
-  # atproto thing
+(did-web) {
   handle /.well-known/atproto-did {
     header Access-Control-Allow-Origin "*"
-    respond "did:web:dongs.zip"
+    respond "did:web:{args[0]}"
   }
 
   handle /.well-known/did.json {
···
           "https://w3id.org/security/multikey/v1",
           "https://w3id.org/security/suites/secp256k1-2019/v1"
         ],
-        "id": "did:web:dongs.zip",
+        "id": "did:web:{args[0]}",
         "alsoKnownAs": [
-          "at://dongs.zip"
+          "at://{args[1]}"
         ],
         "verificationMethod": [
           {
-            "id": "did:web:dongs.zip#atproto",
+            "id": "did:web:{args[0]}#atproto",
             "type": "Multikey",
-            "controller": "did:web:dongs.zip",
-            "publicKeyMultibase": "zQ3sha8L4YgButkPAFtN4LB2cNai6bBbm7yFJ2kS5iG6KySxd"
+            "controller": "did:web:{args[0]}",
+            "publicKeyMultibase": "{args[2]}"
           }
         ],
         "service": [
           {
             "id": "#atproto_pds",
             "type": "AtprotoPersonalDataServer",
-            "serviceEndpoint": "https://pds.vielle.dev"
+            "serviceEndpoint": "https://{args[3]}"
           }
         ]
       }
       JSON 200
   }
+}
+
+## main site
+www.{$HOST:vielle.dev} {
+  redir https://{$HOST:vielle.dev}{uri}
+}
+
+{$HOST:vielle.dev} {
+  log prs {
+    output stdout
+    format console
+  }
+  
+  reverse_proxy prs:4321
+}
+
+## dongs.zip
+{$DONG_HOST:dongs.zip} {
+  log dong {
+    output stdout
+    format console
+  }
+
+  import did-web "{$DONG_HOST:dongs.zip}" "{$DONG_HOST:dongs.zip}" "zQ3sha8L4YgButkPAFtN4LB2cNai6bBbm7yFJ2kS5iG6KySxd", "pds.vielle.dev"
+  import error
   
   encode
   root /srv/dong-web
-  import error
   file_server
 }
 
-dong.{$HOST:localhost} {
-  redir https://dongs.zip{uri}
+## misc did:web
+alt.{$HOST:vielle.dev} {
+  import did-web "alt.{$HOST:vielle.dev}" "alt.{$HOST:vielle.dev}" "zQ3shpgbkbxvf5UjBwQcnjf68rg2DKTRQSttBEGokZbx2BzxY" "pds.vielle.dev"
+}
+
+## send old dong.vielle.dev => dongs.zip
+dong.{$HOST:vielle.dev} {
+  redir https://{$DONG_HOST:dongs.zip}{uri}
 }
 
-saltire-the-gays.{$HOST:localhost} {
+## toy projects
+saltire-the-gays.{$HOST:vielle.dev} {
   log saltire {
     output stdout
     format console
···
   file_server
 }
 
-dnd.{$HOST:localhost} {
+dnd.{$HOST:vielle.dev} {
   log dnd {
     output stdout
     format console
···
   file_server
 }
 
-pds.{$HOST:localhost} {
+## atproto services
+### pds
+pds.{$HOST:vielle.dev} {
   log pds {
     output stdout
     format console
···
   }
 }
 
-*.pds.{$HOST:localhost} {
+*.pds.{$HOST:vielle.dev} {
   log pds-did {
     output stdout
     format console
···
 
   # required as magicDNS (tailscale) doesn't support 
   # subdomains without running own dns server
+  # changes example.PDS_DOMAIN/.well-known/atproto-did to PDS_DOMAIN/.well-known/atproto-did/example.PDS_DOMAIN
+  # requires support in the pds (see https://tangled.org/vielle.dev/pi-config)
   rewrite /.well-known/atproto-did /.well-known/atproto-did/{http.request.host}
 
-  reverse_proxy {$PI_ADDRESS:pi}:8000 {
+  reverse_proxy {$PI_ADDRESS:pi}:{$PI_PORT_PDS:8000} {
     transport http {
       dial_timeout 5s
     }
   }
 }
 
-knot.{$HOST:localhost} {
+### tangled knot
+# (see nginx.conf for ssh proxying)
+knot.{$HOST:vielle.dev} {
   log knot {
     output stdout
     format console
···
   @landing path /knot /styles.css
   reverse_proxy @landing landing:8000
 
-  reverse_proxy {$PI_ADDRESS:pi}:5555
+  reverse_proxy {$PI_ADDRESS:pi}:{$PI_PORT_KNOT:5555}
 }
 
-piper.{$HOST:localhost} {
+### piper instance
+# technically publicly visible... its _fine_ (+ i cant do jack shit abt it rn so)
+piper.{$HOST:vielle.dev} {
   log piper {
     output stdout
     format console
   }
 
-  reverse_proxy {$PI_ADDRESS:pi}:8010
-}
-
-alt.vielle.dev {
-  handle /.well-known/atproto-did {
-    header Access-Control-Allow-Origin "*"
-    respond "did:web:alt.vielle.dev"
-  }
-
-  handle /.well-known/did.json {
-    header Content-Type "application/json"
-    header Access-Control-Allow-Origin "*"
-    respond <<JSON
-      {
-        "@context": [
-          "https://www.w3.org/ns/did/v1",
-          "https://w3id.org/security/multikey/v1",
-          "https://w3id.org/security/suites/secp256k1-2019/v1"
-        ],
-        "id": "did:web:alt.vielle.dev",
-        "alsoKnownAs": [
-          "at://alt.vielle.dev"
-        ],
-        "verificationMethod": [
-          {
-            "id": "did:web:alt.vielle.dev#atproto",
-            "type": "Multikey",
-            "controller": "did:web:alt.vielle.dev",
-            "publicKeyMultibase": "zQ3shpgbkbxvf5UjBwQcnjf68rg2DKTRQSttBEGokZbx2BzxY"
-          }
-        ],
-        "service": [
-          {
-            "id": "#atproto_pds",
-            "type": "AtprotoPersonalDataServer",
-            "serviceEndpoint": "https://pds.vielle.dev"
-          }
-        ]
-      }
-      JSON 200 
-  }
+  reverse_proxy {$PI_ADDRESS:pi}:{$PO_PORT_PIPER:8010}
 }