From 634bcb95d663bbc18192b2b9d5a16f1a8a828c1f Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 27 Apr 2021 19:50:47 +0100 Subject: [PATCH] Revert "Re-enable XLXPEER" This reverts commit b4b8cdcb68969ba205a49bb293ca9aaf5a1ea16c. --- bridge_master.py | 3 +++ docker-configs/update_freedmr.sh | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 100755 docker-configs/update_freedmr.sh diff --git a/bridge_master.py b/bridge_master.py index d78a24d..8c0b791 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -2157,6 +2157,9 @@ if __name__ == '__main__': for system in CONFIG['SYSTEMS']: if CONFIG['SYSTEMS'][system]['ENABLED']: + if CONFIG['SYSTEMS'][system]['MODE'] == 'XLXPEER': + logger.warning('(GLOBAL) system %s not started - XLXPEER connections currently unsupported ', system) + continue if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': systems[system] = routerOBP(system, CONFIG, report_server) else: diff --git a/docker-configs/update_freedmr.sh b/docker-configs/update_freedmr.sh deleted file mode 100755 index e39d48a..0000000 --- a/docker-configs/update_freedmr.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -echo updating FreeDMR to latest docker build - -docker pull hacknix/freedmr:development-latest && -docker container rm freedmr --force && -docker run -d --name freedmr --read-only -v /etc/freedmr/freedmr.cfg:/opt/freedmr/freedmr.cfg -v /var/log/freedmr/freedmr.log:/opt/freedmr/freedmr.log -v /etc/freedmr/rules.py:/opt/freedmr/rules.py -p 62031:62031/udp -p 62045:62045/udp -p 4321:4321/tcp hacknix/freedmr:latest && -conntrack -F - -echo Done -