From e1ab5b7131fcac328037750b920784e0581998e1 Mon Sep 17 00:00:00 2001 From: Joseph Nuthalapati Date: Mon, 7 May 2018 20:54:30 +0530 Subject: [PATCH] tt-rss: Skip the check for SELF_URL_PATH TT-RSS on FreedomBox was working earlier with multiple domain names including tor onion urls. A recent update added a check to allow TT-RSS only from one pre-configured domain name. This commit disables this check so that TT-RSS can work like before. Signed-off-by: Joseph Nuthalapati Reviewed-by: James Valleroy --- actions/ttrss | 10 ++++++++++ plinth/modules/ttrss/__init__.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/actions/ttrss b/actions/ttrss index 33de44e2b..33557ff39 100755 --- a/actions/ttrss +++ b/actions/ttrss @@ -58,11 +58,21 @@ def subcommand_setup(_): aug.set('/files' + DEFAULT_FILE + '/DISABLED', '0') + skip_self_url_path_exists = False + for match in aug.match('/files' + CONFIG_FILE + '/define'): if aug.get(match) == 'SELF_URL_PATH': aug.set(match + '/value', "'http://localhost/tt-rss/'") elif aug.get(match) == 'PLUGINS': aug.set(match + '/value', "'auth_remote, note'") + elif aug.get(match) == '_SKIP_SELF_URL_PATH_CHECKS': + skip_self_url_path_exists = True + aug.set(match + '/value', 'true') + + if not skip_self_url_path_exists: + aug.set('/files' + CONFIG_FILE + '/define[last() + 1]', + '_SKIP_SELF_URL_PATH_CHECKS') + aug.set('/files' + CONFIG_FILE + '/define[last()]/value', 'true') aug.save() diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index 166c42083..7ead6d3da 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -28,7 +28,7 @@ from plinth.utils import format_lazy from .manifest import clients -version = 2 +version = 3 managed_services = ['tt-rss']