| 1 | diff --git a/deploy/edge/slate.Caddyfile.snippet b/deploy/edge/slate.Caddyfile.snippet |
| 2 | deleted file mode 100644 |
| 3 | index d385e25..0000000 |
| 4 | --- a/deploy/edge/slate.Caddyfile.snippet |
| 5 | +++ /dev/null |
| 6 | @@ -1,14 +0,0 @@ |
| 7 | -# Add to the relay host's Caddyfile. The edge machine reaches this listener |
| 8 | -# over the tailnet only; the port is not published anywhere else. |
| 9 | -http://012.run:8080, http://*.012.run:8080 { |
| 10 | - reverse_proxy 127.0.0.1:7447 |
| 11 | - @signerQR path /qr.svg /r/*/qr.svg |
| 12 | - log_skip @signerQR |
| 13 | - log { |
| 14 | - output file /logs/access.json { |
| 15 | - roll_size 10MiB |
| 16 | - roll_keep 7 |
| 17 | - } |
| 18 | - format json |
| 19 | - } |
| 20 | -} |
| 21 | diff --git a/deploy/tiny.Caddyfile b/deploy/tiny.Caddyfile |
| 22 | index 922aa0d..2bac560 100644 |
| 23 | --- a/deploy/tiny.Caddyfile |
| 24 | +++ b/deploy/tiny.Caddyfile |
| 25 | @@ -28,3 +28,17 @@ https://tiny.tailbe516a.ts.net { |
| 26 | format json |
| 27 | } |
| 28 | } |
| 29 | + |
| 30 | +# Public domain via the Fly edge over the tailnet. Not published anywhere else. |
| 31 | +http://012.run:8080, http://*.012.run:8080 { |
| 32 | + reverse_proxy 127.0.0.1:7447 |
| 33 | + @signerQR path /qr.svg /r/*/qr.svg |
| 34 | + log_skip @signerQR |
| 35 | + log { |
| 36 | + output file /logs/access.json { |
| 37 | + roll_size 10MiB |
| 38 | + roll_keep 7 |
| 39 | + } |
| 40 | + format json |
| 41 | + } |
| 42 | +} |
| 43 | diff --git a/docs/personal-relay.md b/docs/personal-relay.md |
| 44 | index 0e74507..f9f2267 100644 |
| 45 | --- a/docs/personal-relay.md |
| 46 | +++ b/docs/personal-relay.md |
| 47 | @@ -14,7 +14,7 @@ fly certs check 012.run |
| 48 | fly certs check "*.012.run" |
| 49 | ``` |
| 50 | |
| 51 | -DNS at the registrar, all DNS-only records: A and AAAA for `012.run` and `*.012.run` pointing at the app's addresses from `fly ips list`, and a `_acme-challenge.012.run` CNAME from `fly certs setup "*.012.run"` for the wildcard certificate. The relay host's Caddyfile serves `012.run:8080` and `*.012.run:8080` over plain HTTP for the edge; see `deploy/edge/slate.Caddyfile.snippet`. After the certificates issue, set `--public-url https://012.run` on the relay so signed requests, NIP-11 and site hosts use the public name. The ts.net name stays tailnet only. |
| 52 | +DNS at the registrar, all DNS-only records with Cloudflare's Universal SSL turned off so its challenge records do not shadow Fly's: A and AAAA for `012.run` and `*.012.run` pointing at the app's addresses from `fly ips list`, and a `_acme-challenge.012.run` CNAME from `fly certs setup "*.012.run"` for the wildcard certificate. The relay host's Caddyfile, `deploy/tiny.Caddyfile`, serves `012.run:8080` and `*.012.run:8080` over plain HTTP for the edge. After the certificates issue, set `--public-url https://012.run` on the relay so signed requests, NIP-11 and site hosts use the public name. The ts.net name stays tailnet only. |
| 53 | |
| 54 | ## Repository hosting |
| 55 | |
| 56 | @@ -22,13 +22,13 @@ The relay hosts Git repositories over GRASP. Use [ngit](https://ngit.dev) so the |
| 57 | |
| 58 | ```sh |
| 59 | ngit account login |
| 60 | -ngit init --name tiny --identifier tinyrelay --grasp-server tiny.tailbe516a.ts.net \ |
| 61 | +ngit init --name tiny --identifier tinyrelay --grasp-server 012.run \ |
| 62 | --description "self-hosted, multitenant Nostr relay" |
| 63 | -git remote add tiny nostr://<owner npub>/tiny.tailbe516a.ts.net/tinyrelay |
| 64 | +git remote add tiny nostr://<owner npub>/012.run/tinyrelay |
| 65 | git push tiny main --tags |
| 66 | ``` |
| 67 | |
| 68 | -Later pushes are plain `git push tiny`. Anyone can clone the repository with `git clone nostr://<owner npub>/tiny.tailbe516a.ts.net/tinyrelay`, or with plain Git from `https://tiny.tailbe516a.ts.net/<owner npub>/tinyrelay.git`. |
| 69 | +Later pushes are plain `git push tiny`. `ngit init` rewrites `origin` to the nostr address each time it runs; set it back to GitHub afterwards. Anyone can clone the repository with `git clone nostr://<owner npub>/012.run/tinyrelay`, or with plain Git from `https://012.run/<owner npub>/tinyrelay.git`. |
| 70 | |
| 71 | ## Web operations |
| 72 | |