Unverified Commit bfb1e834 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'main' into efa-support

parents 42f9a00d f1da50f9
Loading
Loading
Loading
Loading
+14 −5
Original line number Diff line number Diff line
@@ -2,12 +2,15 @@ travelynx - Railway Travel Logger
---

[travelynx](https://finalrewind.org/projects/travelynx/) allows checking into
and out of individual trains, thus providing a log of your railway journeys
annotated with real-time delays and service messages. It supports german
railways and trains exposed by the Deutsche Bahn [IRIS
individual public transit vehicles (e.g. buses, ferries, trams, trains) across
most of Germany, Switzerland, Austria, Luxembourg, Ireland, and parts of the
USA. Thus, it provides a log of your railway journeys annotated with real-time
delays and service messages, if available. It supports german railways and
trains exposed by the Deutsche Bahn [IRIS
Interface](https://finalrewind.org/projects/Travel-Status-DE-IRIS/) as well as
local transit and some trains outside of germany exposed by the Deutsche Bahn
[HAFAS Interface](https://finalrewind.org/projects/Travel-Status-DE-DeutscheBahn/).
regional and local transit exposed by supported [HAFAS
Instances](https://finalrewind.org/projects/Travel-Status-DE-HAFAS/).  Support
for EFA instances and bahn.de is under way.

You can use the public instance on [travelynx.de](https://travelynx.de) or
host your own. See the Installation and Setup notes below.
@@ -79,6 +82,12 @@ Please open an issue on <https://github.com/derf/travelynx/issues> or send a
mail to derf+travelynx@finalrewind.org if there is anything missing or
ambiguous in this setup manual.

Note that Deutsche Bahn have put parts of their API behind an IP reputation
filter. In general, checkins with the bahn.de backend will only be possible if
travelynx is accessing it from a residential (non-server) IP range.  See the
dbris bahn.de proxy / proxies setting in `example/travelynx.conf` for
workarounds.

Updating
---

+5 −2
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ requires 'DateTime::Format::Strptime';
requires 'Email::Sender::Simple';
requires 'GIS::Distance';
requires 'GIS::Distance::Fast';
requires 'IO::Socket::Socks', '>= 0.64';
requires 'IO::Socket::SSL',   '>= 2.009';
requires 'List::UtilsBy';
requires 'Math::Polygon';
requires 'MIME::Entity';
@@ -15,9 +17,10 @@ requires 'Mojolicious::Plugin::OAuth2';
requires 'Mojo::Pg';
requires 'Text::CSV';
requires 'Text::Markdown';
requires 'Travel::Status::DE::DBWagenreihung', '== 0.18';
requires 'Travel::Status::DE::EFA';
requires 'Travel::Status::DE::HAFAS', '>= 5.03';
requires 'Travel::Status::MOTIS', '>= 0.01';
requires 'Travel::Status::DE::DBRIS', '>= 0.10';
requires 'Travel::Status::DE::HAFAS', '>= 6.20';
requires 'Travel::Status::DE::IRIS';
requires 'UUID::Tiny';
requires 'JSON';
+709 −607

File changed.

Preview size limit exceeded, changes collapsed.

+28 −0
Original line number Diff line number Diff line
@@ -35,6 +35,34 @@
		password => die("Changeme!"),
	},

	# Settings specific to the DBRIS bahn.de backend.
	# Their journey endpoint (which is required for checkins) is behind an IP
	# reputation filter, denying requests from most non-residential IP ranges.
	# If needed, you can specify either a single SOCKS proxy or a set of
	# SOCKS proxies here, and thus work around that limitation. If multiple
	# proxies are specified, travelynx will choose a random one for each
	# request. Note that DBRIS bahn.de requests to non-journey endpoints
	# (such as the departure board) are always sent directly and not passed
	# through the proxy / proxies specified here.
	# "proxies" takes precedence over "proxy".
	dbris => {
		'bahn.de' => {
			# proxy => 'socks://127.0.0.1:18080', # <- either this
			# proxies => ['socks://127.0.0.1:18080', 'socks://127.0.0.1:18081'],
		},
	},

	# Settings specific to HAFAS backends.
	# For instance, the PKP backend is hidden behind a GeoIP filter, hence
	# travelynx only supports it if travelynx.conf either indicates that it
	# is reachable or specifies a proxy.
	hafas => {
		PKP => {
			# geoip_ok => 1,          # <- either this
			# proxy => 'socks://...', # <- or this
		},
	},

	# These settings control the amount and (re)spawn behaviour of travelynx
	# worker processes as well as IP, port, and PID file. They are suitable for
	# up to a few dozen concurrent users. If your site has more traffic, you
+443 −50

File changed.

Preview size limit exceeded, changes collapsed.

Loading