KB8PMY
/
ADN-DMR-Peer-Server
mirror of https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix port parrot

Browse Source
pull/6/head
Esteban Mackay Q. 2 years ago
parent 9d2f84df74
commit 38fa4c68ec
3 changed files with 122 additions and 43 deletions
Show Stats Download Patch File Download Diff File

46
config/ADN-MINIMAL.cfg
Unescape View File

@ -18,39 +18,36 @@ SERVER_ID: 0
#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration #This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
#If you joing ADN-Systems, you will be given a config like this to paste in #If you joing ADN-Systems, you will be given a config like this to paste in
[OBP-TEST] [OBP-TEST]
MODE: OPENBRIDGE MODE: OPENBRIDGE
ENABLED: False ENABLED: False
IP: IP:
PORT: 62044 PORT: 62044
#The ID which you expect to see sent from the other end of the link.
NETWORK_ID: 1 NETWORK_ID: 1
PASSPHRASE: mypass PASSPHRASE: mypass
TARGET_IP: TARGET_IP:
TARGET_PORT: 62044 TARGET_PORT: 62044
USE_ACL: True USE_ACL: True
SUB_ACL: DENY:1 SUB_ACL: DENY:1
TGID_ACL: PERMIT:ALL TGID_ACL: DENY:0-82,92-199,800-899,9990-9999,900999
#Should always be true if using docker.
RELAX_CHECKS: True RELAX_CHECKS: True
#True for FBP, False for OBP
ENHANCED_OBP: True ENHANCED_OBP: True
#PROTO_VER should be 5 for ADN-Systems servers using FBP
#1 for other servers using OBP
PROTO_VER: 5 PROTO_VER: 5
#This defines parameters for repeater/hotspot connections #This defines parameters for repeater/hotspot connections
#via HomeBrewProtocol (HBP) #via HomeBrewProtocol (HBP)
#I don't recommend changing most of this unless you know what you are doing #I don't recommend changing most of this unless you know what you are doing
[SYSTEM] [SYSTEM]
MODE: MASTER MODE: MASTER
ENABLED: True ENABLED: True
REPEAT: True REPEAT: True
MAX_PEERS: 1 MAX_PEERS: 1
EXPORT_AMBE: False EXPORT_AMBE: False
IP: 127.0.0.1 IP:
PORT: 56400 PORT: 56400
PASSPHRASE: passw0rd PASSPHRASE:
GROUP_HANGTIME: 5 GROUP_HANGTIME: 5
USE_ACL: True USE_ACL: True
REG_ACL: DENY:1 REG_ACL: DENY:1
@ -69,14 +66,14 @@ ALLOW_UNREG_ID: False
PROXY_CONTROL: False PROXY_CONTROL: False
OVERRIDE_IDENT_TG: OVERRIDE_IDENT_TG:
#Echo (Loro / Parrot) server
[ECHO] [ECHO]
MODE: PEER MODE: PEER
ENABLED: True ENABLED: True
LOOSE: False LOOSE: False
EXPORT_AMBE: False EXPORT_AMBE: False
IP: 127.0.0.1 IP: 127.0.0.1
PORT: 54916 PORT: 54917
MASTER_IP: 127.0.0.1 MASTER_IP: 127.0.0.1
MASTER_PORT: 54915 MASTER_PORT: 54915
PASSPHRASE: passw0rd PASSPHRASE: passw0rd
@ -103,3 +100,32 @@ TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL
ANNOUNCEMENT_LANGUAGE: en_GB ANNOUNCEMENT_LANGUAGE: en_GB
[D-APRS]
MODE: MASTER
ENABLED: True
REPEAT: False
MAX_PEERS: 1
EXPORT_AMBE: False
IP:
PORT: 52555
PASSPHRASE:
GROUP_HANGTIME: 0
USE_ACL: True
REG_ACL: DENY:1
SUB_ACL: DENY:1
TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL
DEFAULT_UA_TIMER: 10
SINGLE_MODE: False
VOICE_IDENT: False
TS1_STATIC:
TS2_STATIC:
DEFAULT_REFLECTOR: 0
ANNOUNCEMENT_LANGUAGE: en_GB
GENERATOR: 2
ALLOW_UNREG_ID: True
PROXY_CONTROL: False
OVERRIDE_IDENT_TG:

52
config/ADN-SAMPLE-commented.cfg
Unescape View File

@ -102,22 +102,24 @@ LOG_NAME: ADN
# HBlink to use, and will NOT be used in HBlink directly. # HBlink to use, and will NOT be used in HBlink directly.
# STALE_DAYS is the number of days since the last download before we # STALE_DAYS is the number of days since the last download before we
# download again. Don't be an ass and change this to less than a few days. # download again. Don't be an ass and change this to less than a few days.
[ALIASES] [ALIASES]
TRY_DOWNLOAD: True TRY_DOWNLOAD: True
PATH: ./data PATH: ./data/
PEER_FILE: peer_ids.json PEER_FILE: peer_ids.json
SUBSCRIBER_FILE: subscriber_ids.json SUBSCRIBER_FILE: subscriber_ids.json
TGID_FILE: talkgroup_ids.json TGID_FILE: talkgroup_ids.json
PEER_URL: https://adn.systems/files/peer_ids.json PEER_URL: https://adn.systems/files/peer_ids.json
SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json
TGID_URL: https://adn.systems/files/talkgroup_ids.json TGID_URL: https://adn.systems/files/talkgroup_ids.json
LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json
STALE_DAYS: 1
SUB_MAP_FILE:
SERVER_ID_URL: https://adn.systems/files/server_ids.tsv SERVER_ID_URL: https://adn.systems/files/server_ids.tsv
SERVER_ID_FILE: server_ids.tsv
CHECKSUM_URL: https://adn.systems/files/file_checksums.json CHECKSUM_URL: https://adn.systems/files/file_checksums.json
LOCAL_SUBSCRIBER_FILE: subscriber_ids.json
STALE_DAYS: 1
SUB_MAP_FILE: sub_map.pkl
SERVER_ID_FILE: server_ids.tsv
CHECKSUM_FILE: file_checksums.json CHECKSUM_FILE: file_checksums.json
KEYS_FILE: keys.json
#Control server shared allstar instance via dial / AMI #Control server shared allstar instance via dial / AMI
[ALLSTAR] [ALLSTAR]
@ -158,6 +160,7 @@ TABLE: repeaters
# Otherwise ACLs work as described in the global stanza # Otherwise ACLs work as described in the global stanza
#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration #This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
#If you joing ADN-Systems, you will be given a config like this to paste in #If you joing ADN-Systems, you will be given a config like this to paste in
[OBP-TEST] [OBP-TEST]
MODE: OPENBRIDGE MODE: OPENBRIDGE
ENABLED: False ENABLED: False
@ -195,13 +198,14 @@ PROTO_VER: 5
#This defines parameters for repeater/hotspot connections #This defines parameters for repeater/hotspot connections
#via HomeBrewProtocol (HBP) #via HomeBrewProtocol (HBP)
#I don't recommend changing most of this unless you know what you are doing #I don't recommend changing most of this unless you know what you are doing
[SYSTEM] [SYSTEM]
MODE: MASTER MODE: MASTER
ENABLED: True ENABLED: True
REPEAT: True REPEAT: True
MAX_PEERS: 1 MAX_PEERS: 1
EXPORT_AMBE: False EXPORT_AMBE: False
IP: 127.0.0.1 IP:
PORT: 56400 PORT: 56400
PASSPHRASE: PASSPHRASE:
GROUP_HANGTIME: 5 GROUP_HANGTIME: 5
@ -222,19 +226,19 @@ ALLOW_UNREG_ID: False
PROXY_CONTROL: False PROXY_CONTROL: False
OVERRIDE_IDENT_TG: OVERRIDE_IDENT_TG:
#Echo (Loro / Parrot) server
[ECHO] [ECHO]
MODE: PEER MODE: PEER
ENABLED: True ENABLED: True
LOOSE: False LOOSE: False
EXPORT_AMBE: False EXPORT_AMBE: False
IP: 127.0.0.1 IP: 127.0.0.1
PORT: 54916 PORT: 54917
MASTER_IP: 127.0.0.1 MASTER_IP: 127.0.0.1
MASTER_PORT: 54915 MASTER_PORT: 54915
PASSPHRASE: passw0rd PASSPHRASE: passw0rd
CALLSIGN: ECHO CALLSIGN: ECHO
RADIO_ID: 1000001 RADIO_ID: 9990
RX_FREQ: 449000000 RX_FREQ: 449000000
TX_FREQ: 444000000 TX_FREQ: 444000000
TX_POWER: 25 TX_POWER: 25
@ -255,3 +259,33 @@ SUB_ACL: DENY:1
TGID_TS1_ACL: PERMIT:ALL TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL
ANNOUNCEMENT_LANGUAGE: en_GB ANNOUNCEMENT_LANGUAGE: en_GB
[D-APRS]
MODE: MASTER
ENABLED: True
REPEAT: False
MAX_PEERS: 1
EXPORT_AMBE: False
IP:
PORT: 52555
PASSPHRASE:
GROUP_HANGTIME: 0
USE_ACL: True
REG_ACL: DENY:1
SUB_ACL: DENY:1
TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL
DEFAULT_UA_TIMER: 10
SINGLE_MODE: False
VOICE_IDENT: False
TS1_STATIC:
TS2_STATIC:
DEFAULT_REFLECTOR: 0
ANNOUNCEMENT_LANGUAGE: en_GB
GENERATOR: 2
ALLOW_UNREG_ID: True
PROXY_CONTROL: False
OVERRIDE_IDENT_TG:

67
config/ADN-SAMPLE.cfg
Unescape View File

@ -14,7 +14,6 @@ SERVER_ID: 0000
DATA_GATEWAY: False DATA_GATEWAY: False
VALIDATE_SERVER_IDS: True VALIDATE_SERVER_IDS: True
[REPORTS] [REPORTS]
REPORT: True REPORT: True
REPORT_INTERVAL: 60 REPORT_INTERVAL: 60
@ -22,28 +21,28 @@ REPORT_PORT: 4321
REPORT_CLIENTS: 127.0.0.1 REPORT_CLIENTS: 127.0.0.1
[LOGGER] [LOGGER]
LOG_FILE: adn.log LOG_FILE: /dev/null
LOG_HANDLERS: console-timed LOG_HANDLERS: console-timed
LOG_LEVEL: INFO LOG_LEVEL: DEBUG
LOG_NAME: ADN LOG_NAME: FreeDMR
[ALIASES] [ALIASES]
TRY_DOWNLOAD: True TRY_DOWNLOAD: True
PATH: ./data PATH: ./data/
PEER_FILE: peer_ids.json PEER_FILE: peer_ids.json
SUBSCRIBER_FILE: subscriber_ids.json SUBSCRIBER_FILE: subscriber_ids.json
TGID_FILE: talkgroup_ids.json TGID_FILE: talkgroup_ids.json
PEER_URL: https://adn.systems/files/peer_ids.json PEER_URL: https://adn.systems/files/peer_ids.json
SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json
TGID_URL: https://adn.systems/files/talkgroup_ids.json TGID_URL: https://adn.systems/files/talkgroup_ids.json
LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json
STALE_DAYS: 1
SUB_MAP_FILE:
SERVER_ID_URL: https://adn.systems/files/server_ids.tsv SERVER_ID_URL: https://adn.systems/files/server_ids.tsv
SERVER_ID_FILE: server_ids.tsv
CHECKSUM_URL: https://adn.systems/files/file_checksums.json CHECKSUM_URL: https://adn.systems/files/file_checksums.json
LOCAL_SUBSCRIBER_FILE: subscriber_ids.json
STALE_DAYS: 1
SUB_MAP_FILE: sub_map.pkl
SERVER_ID_FILE: server_ids.tsv
CHECKSUM_FILE: file_checksums.json CHECKSUM_FILE: file_checksums.json
KEYS_FILE: keys.json
#Control server shared allstar instance via dial / AMI #Control server shared allstar instance via dial / AMI
[ALLSTAR] [ALLSTAR]
@ -54,39 +53,29 @@ SERVER: my.asl.server
PORT: 5038 PORT: 5038
NODE: 0000 NODE: 0000
#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
#If you joing ADN-Systems, you will be given a config like this to paste in
[OBP-TEST] [OBP-TEST]
MODE: OPENBRIDGE MODE: OPENBRIDGE
ENABLED: False ENABLED: False
IP: IP:
PORT: 62044 PORT: 62044
#The ID which you expect to see sent from the other end of the link.
NETWORK_ID: 1 NETWORK_ID: 1
PASSPHRASE: mypass PASSPHRASE: mypass
TARGET_IP: TARGET_IP:
TARGET_PORT: 62044 TARGET_PORT: 62044
USE_ACL: True USE_ACL: True
SUB_ACL: DENY:1 SUB_ACL: DENY:1
TGID_ACL: PERMIT:ALL TGID_ACL: DENY:0-82,92-199,800-899,9990-9999,900999
#Should always be true if using docker.
RELAX_CHECKS: True RELAX_CHECKS: True
#True for FBP, False for OBP
ENHANCED_OBP: True ENHANCED_OBP: True
#PROTO_VER should be 5 for ADN-Systems servers using FBP
#1 for other servers using OBP
PROTO_VER: 5 PROTO_VER: 5
#This defines parameters for repeater/hotspot connections
#via HomeBrewProtocol (HBP)
#I don't recommend changing most of this unless you know what you are doing
[SYSTEM] [SYSTEM]
MODE: MASTER MODE: MASTER
ENABLED: True ENABLED: True
REPEAT: True REPEAT: True
MAX_PEERS: 1 MAX_PEERS: 1
EXPORT_AMBE: False EXPORT_AMBE: False
IP: 127.0.0.1 IP:
PORT: 56400 PORT: 56400
PASSPHRASE: PASSPHRASE:
GROUP_HANGTIME: 5 GROUP_HANGTIME: 5
@ -107,14 +96,14 @@ ALLOW_UNREG_ID: False
PROXY_CONTROL: False PROXY_CONTROL: False
OVERRIDE_IDENT_TG: OVERRIDE_IDENT_TG:
#Echo (Loro / Parrot) server
[ECHO] [ECHO]
MODE: PEER MODE: PEER
ENABLED: True ENABLED: True
LOOSE: False LOOSE: False
EXPORT_AMBE: False EXPORT_AMBE: False
IP: 127.0.0.1 IP: 127.0.0.1
PORT: 54916 PORT: 54917
MASTER_IP: 127.0.0.1 MASTER_IP: 127.0.0.1
MASTER_PORT: 54915 MASTER_PORT: 54915
PASSPHRASE: passw0rd PASSPHRASE: passw0rd
@ -140,3 +129,33 @@ SUB_ACL: DENY:1
TGID_TS1_ACL: PERMIT:ALL TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL TGID_TS2_ACL: PERMIT:ALL
ANNOUNCEMENT_LANGUAGE: en_GB ANNOUNCEMENT_LANGUAGE: en_GB
[D-APRS]
MODE: MASTER
ENABLED: True
REPEAT: False
MAX_PEERS: 1
EXPORT_AMBE: False
IP:
PORT: 52555
PASSPHRASE:
GROUP_HANGTIME: 0
USE_ACL: True
REG_ACL: DENY:1
SUB_ACL: DENY:1
TGID_TS1_ACL: PERMIT:ALL
TGID_TS2_ACL: PERMIT:ALL
DEFAULT_UA_TIMER: 10
SINGLE_MODE: False
VOICE_IDENT: False
TS1_STATIC:
TS2_STATIC:
DEFAULT_REFLECTOR: 0
ANNOUNCEMENT_LANGUAGE: en_GB
GENERATOR: 2
ALLOW_UNREG_ID: True
PROXY_CONTROL: False
OVERRIDE_IDENT_TG:

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.