From 0217a13da61191bb83b056755cd589a8baeb8796 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 25 Mar 2015 16:51:55 -0700 Subject: [PATCH] change relay URL: use more distinctive path prefix This might make it easier for an application's web site to include a relay, without competing with some other resource named "relay". --- src/wormhole/public_relay.py | 2 +- src/wormhole/servers/relay.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wormhole/public_relay.py b/src/wormhole/public_relay.py index c4adc4d..1f7a617 100644 --- a/src/wormhole/public_relay.py +++ b/src/wormhole/public_relay.py @@ -1,5 +1,5 @@ # This is a relay I run on a personal server. If it gets too expensive to # run, I'll shut it down. -RENDEZVOUS_RELAY = "http://wormhole-relay.petmail.org:3000/relay/" +RENDEZVOUS_RELAY = "http://wormhole-relay.petmail.org:3000/wormhole-relay/" TRANSIT_RELAY = "tcp:wormhole-transit-relay.petmail.org:3001" diff --git a/src/wormhole/servers/relay.py b/src/wormhole/servers/relay.py index c672018..49873de 100644 --- a/src/wormhole/servers/relay.py +++ b/src/wormhole/servers/relay.py @@ -324,7 +324,7 @@ class RelayServer(service.MultiService): self.relayport_service = strports.service(relayport, site) self.relayport_service.setServiceParent(self) self.relay = Relay() # accessible from tests - self.root.putChild("relay", self.relay) + self.root.putChild("wormhole-relay", self.relay) t = internet.TimerService(5*MINUTE, self.relay.prune_old_channels) t.setServiceParent(self) self.transit = Transit()