diff --git a/.gitea/workflows/npm-publish.yml b/.gitea/workflows/npm-publish.yml index 73ab687..ca6ad9e 100644 --- a/.gitea/workflows/npm-publish.yml +++ b/.gitea/workflows/npm-publish.yml @@ -11,11 +11,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Publish to forge.black.local npm registry + - name: Publish to forge.black.lan npm registry run: | chmod +x bin/* - printf '//forge.black.local/api/packages/lilith/npm/:_authToken=%s\n' "$NPM_TOKEN" > .npmrc - npm publish --registry http://forge.black.local/api/packages/lilith/npm/ + printf '//forge.black.lan/api/packages/lilith/npm/:_authToken=%s\n' "$NPM_TOKEN" > .npmrc + npm publish --registry http://forge.black.lan/api/packages/lilith/npm/ rm .npmrc env: NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 3894ef0..853b931 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ a detached tmux session on the remote so the work survives the SSH drop. On every host that should have these on `$PATH`: ```sh -git clone http://forge.black.local/lilith/session-tools.git ~/Code/@scripts/session-tools +git clone http://forge.black.lan/lilith/session-tools.git ~/Code/@scripts/session-tools ~/Code/@scripts/session-tools/install.sh ``` diff --git a/bin/quinn-phone-bootstrap b/bin/quinn-phone-bootstrap index 190a4c1..5c3bf81 100755 --- a/bin/quinn-phone-bootstrap +++ b/bin/quinn-phone-bootstrap @@ -4,7 +4,7 @@ # # What it runs (in order): # 1. wg-dns-sync on apricot — installs/updates dnsmasq wg-mesh.conf, -# so the phone resolves *.apricot.local etc. +# so the phone resolves *.apricot.lan etc. # Requires interactive sudo on apricot # (uses ssh -t to forward your tty). # 2. wg-phone-add (locally) — generates or reuses the device's keypair, diff --git a/bin/wg-dns-sync b/bin/wg-dns-sync index d3897cd..985421b 100755 --- a/bin/wg-dns-sync +++ b/bin/wg-dns-sync @@ -7,7 +7,7 @@ # Daemon: dnsmasq.service (restarted only if conf changed) # # Why a separate file (not editing lilith-local.conf): -# lilith-local.conf returns 127.0.0.1 for *.lilith.apricot.local on purpose +# lilith-local.conf returns 127.0.0.1 for *.lilith.apricot.lan on purpose # — that's split-horizon DNS for apricot's own loopback Traefik. Other clients # (e.g. phone over wg1) need the LAN IP instead. This script writes a SECOND # conf file that targets only the wg1 listen address, so both views coexist. diff --git a/bin/wg-phone-add b/bin/wg-phone-add index ded156e..0c3c729 100755 --- a/bin/wg-phone-add +++ b/bin/wg-phone-add @@ -141,4 +141,4 @@ echo "Hub: $hub_endpoint" echo echo "After scanning: enable the tunnel in WireGuard iOS, then test from phone:" echo " ping 10.0.0.116 (apricot LAN)" -echo " open https://quinn.apricot.local/" +echo " open https://quinn.apricot.lan/" diff --git a/data/wg-mesh-hosts.json b/data/wg-mesh-hosts.json index e35e69a..27424ac 100644 --- a/data/wg-mesh-hosts.json +++ b/data/wg-mesh-hosts.json @@ -4,29 +4,29 @@ "_dnsmasq_address_syntax": "Leading dot in 'name' = wildcard match for the domain and any subdomain. No leading dot = exact match only. Exact-match entries are needed to override the more-specific wildcards in /etc/dnsmasq.d/lilith-local.conf which return 127.0.0.1 for apricot's loopback Traefik (split-horizon).", "listen_address": "127.0.0.1,10.9.0.2", "records": [ - { "name": ".apricot.local", "ip": "10.0.0.116", "comment": "wildcard fallback for any *.apricot.local without an exact entry below" }, + { "name": ".apricot.lan", "ip": "10.0.0.116", "comment": "wildcard fallback for any *.apricot.lan without an exact entry below" }, { "name": ".atlilith.local", "ip": "10.0.0.116", "comment": "wildcard for *.atlilith.local TLD" }, - { "name": ".black.local", "ip": "10.0.0.11", "comment": "wildcard for *.black.local" }, + { "name": ".black.lan", "ip": "10.0.0.11", "comment": "wildcard for *.black.lan" }, - { "name": "admin.lilith.apricot.local", "ip": "10.0.0.116", "comment": "platform admin" }, - { "name": "atlilith.lilith.apricot.local", "ip": "10.0.0.116", "comment": "Lilith main site" }, - { "name": "home.atlilith.lilith.apricot.local", "ip": "10.0.0.116", "comment": "Lilith home" }, - { "name": "home.trustedmeet.lilith.apricot.local", "ip": "10.0.0.116", "comment": "TrustedMeet home" }, - { "name": "i.atlilith.lilith.apricot.local", "ip": "10.0.0.116", "comment": "Lilith images" }, - { "name": "lilithcam.lilith.apricot.local", "ip": "10.0.0.116", "comment": "LilithCam" }, - { "name": "lilithfan.lilith.apricot.local", "ip": "10.0.0.116", "comment": "LilithFan" }, - { "name": "lilithstage.lilith.apricot.local", "ip": "10.0.0.116", "comment": "LilithStage" }, - { "name": "live.atlilith.apricot.local", "ip": "10.0.0.116", "comment": "Lilith live" }, - { "name": "models.apricot.local", "ip": "10.0.0.116", "comment": "model registry" }, - { "name": "models.lilith.apricot.local", "ip": "10.0.0.116", "comment": "model registry" }, - { "name": "my.atlilith.lilith.apricot.local", "ip": "10.0.0.116", "comment": "Lilith user app" }, - { "name": "my.quinn.apricot.local", "ip": "10.0.0.116", "comment": "Quinn personal" }, - { "name": "my.trustedmeet.lilith.apricot.local", "ip": "10.0.0.116", "comment": "TrustedMeet user app" }, - { "name": "npm.apricot.local", "ip": "10.0.0.116", "comment": "Verdaccio npm registry UI" }, - { "name": "quinn.apricot.local", "ip": "10.0.0.116", "comment": "Quinn main app" }, - { "name": "spoiledbabes.lilith.apricot.local", "ip": "10.0.0.116", "comment": "SpoiledBabes" }, - { "name": "status.lilith.apricot.local", "ip": "10.0.0.116", "comment": "status dashboard" }, - { "name": "trustedmeet.lilith.apricot.local", "ip": "10.0.0.116", "comment": "TrustedMeet main" }, + { "name": "admin.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "platform admin" }, + { "name": "atlilith.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "Lilith main site" }, + { "name": "home.atlilith.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "Lilith home" }, + { "name": "home.trustedmeet.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "TrustedMeet home" }, + { "name": "i.atlilith.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "Lilith images" }, + { "name": "lilithcam.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "LilithCam" }, + { "name": "lilithfan.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "LilithFan" }, + { "name": "lilithstage.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "LilithStage" }, + { "name": "live.atlilith.apricot.lan", "ip": "10.0.0.116", "comment": "Lilith live" }, + { "name": "models.apricot.lan", "ip": "10.0.0.116", "comment": "model registry" }, + { "name": "models.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "model registry" }, + { "name": "my.atlilith.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "Lilith user app" }, + { "name": "my.quinn.apricot.lan", "ip": "10.0.0.116", "comment": "Quinn personal" }, + { "name": "my.trustedmeet.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "TrustedMeet user app" }, + { "name": "npm.apricot.lan", "ip": "10.0.0.116", "comment": "Verdaccio npm registry UI" }, + { "name": "quinn.apricot.lan", "ip": "10.0.0.116", "comment": "Quinn main app" }, + { "name": "spoiledbabes.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "SpoiledBabes" }, + { "name": "status.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "status dashboard" }, + { "name": "trustedmeet.lilith.apricot.lan", "ip": "10.0.0.116", "comment": "TrustedMeet main" }, { "name": "api.atlilith.local", "ip": "10.0.0.116", "comment": "platform API" }, { "name": "imajin.atlilith.local", "ip": "10.0.0.116", "comment": "image generation API" }, diff --git a/package.json b/package.json index 57c2c69..42905d4 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,6 @@ "bin" ], "publishConfig": { - "registry": "http://forge.black.local/api/packages/lilith/npm/" + "registry": "http://forge.black.lan/api/packages/lilith/npm/" } }