From 4900361621ab20c3a15b4863750c64980845fd3c Mon Sep 17 00:00:00 2001 From: A_D Date: Tue, 5 Jan 2021 18:23:30 +0200 Subject: [PATCH] Set default killswitch URL to releases branch --- docs/Killswitches.md | 6 ++++++ killswitch.py | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/Killswitches.md b/docs/Killswitches.md index 8603d10d..dd2cd154 100644 --- a/docs/Killswitches.md +++ b/docs/Killswitches.md @@ -54,3 +54,9 @@ The current recognised (to EDMC and its internal plugins) killswitch strings are | `plugins.(eddn|inara|edsm|eddb).journal` | Disables all journal processing for EDDN/EDSM/INARA | | `plugins.(edsm|inara).worker` | Disables the EDSM/INARA worker thread (effectively disables updates) (does not close thread) | | `plugins.(eddn|inara|edsm).journal.event.$eventname` | Specific events to disable processing for | + +## File location + +The main killswitch file is kept in the `releases` branch on the EDMC github repo. The file should NEVER be committed to +any other repos. In the case that the killswitch file is found in other repos, the one in releases should always +be taken as correct regardless of others. diff --git a/killswitch.py b/killswitch.py index 44c92177..783b6ccc 100644 --- a/killswitch.py +++ b/killswitch.py @@ -9,8 +9,7 @@ import EDMCLogging logger = EDMCLogging.get_main_logger() -# DEFAULT_KILLSWITCH_URL = 'https://github.com/EDCD/EDMarketConnector' -DEFAULT_KILLSWITCH_URL = 'http://127.0.0.1:8080/killswitches.json' +DEFAULT_KILLSWITCH_URL = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/killswitches.json' _current_version: semantic_version.Version = semantic_version.Version(config.appversion)