Repository navigation
Conversation
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR: feat: run iroh-relay 1.0 next to 0.35, advertise via irohrelay1 metadata
Closes #1010 (relay-side counterpart of chatmail/core#8182).
What it does
second systemd service, plain HTTP on
127.0.0.1:3342, enabled wheneverthe local 0.35 relay runs.
cert as the main host,
/relay,/ping,/generate_204proxied to3342).
chatmail.inioptioniroh_relay_1, mirroringiroh_relaysemantics:
https://<domain>:3341while the 0.35 relay runs/shared/vendor/deltachat/irohrelay1, so core PR #8182 can discover1.0 relays without breaking iroh 0.35 clients (they keep reading
irohrelay).Why a separate port (co-hosting decision for #1010)
Iroh clients overwrite the RelayUrl path before dialling
(
dial_url.set_path(RELAY_PATH), iroh-relaysrc/client.rs), so two relayversions cannot share one origin at different paths. Same hostname on a
different port works: the port is part of the authority and survives
set_path. This keeps 0.35 untouched on the main HTTPS origin and answersthe issue's preference to "run both" without a synchronized cutover.
Verification
iroh-relay v1.3.0booted locally with the shippediroh-relay-1.toml:/ping→ 200,/generate_204→ 204,/relay→ 400 (upgrade required,expected without WS headers).
nginx.conf.j2renders against a realConfig(1×listen 3341 ssl,+IPv6, 3× upstream refs).
(
iroh_relay_1config defaults/custom/empty/external-relay cases,irohrelay/irohrelay1metadata lookups, empty →N).Notes for reviewers
enable_stunfrom the 0.35 config was removed in 1.0 (as anticipated inthe 0.35 config comment) — the new toml omits it.
which runs plain HTTP behind nginx; QUIC addr discovery needs relay-side
TLS). Clients fall back to HTTPS/WebSocket.
/shared/vendor/deltachat/irohrelay1inimap.rsfetch_metadata andfeed it to the iroh 1.0 endpoint setup.