Merge pull request #6 from hp3icc/develop

fix port parrot

config/ADN-MINIMAL.cfg

@@ -18,39 +18,36 @@ SERVER_ID: 0
 
 #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]
 MODE: OPENBRIDGE
 ENABLED: False
 IP:
 PORT: 62044
-#The ID which you expect to see sent from the other end of the link. 
 NETWORK_ID: 1
 PASSPHRASE: mypass
 TARGET_IP: 
 TARGET_PORT: 62044
 USE_ACL: True
 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
-#True for FBP, False for OBP
 ENHANCED_OBP: True
-#PROTO_VER should be 5 for ADN-Systems servers using FBP
-#1 for other servers using OBP
 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]
 MODE: MASTER
 ENABLED: True
 REPEAT: True
 MAX_PEERS: 1
 EXPORT_AMBE: False
-IP: 127.0.0.1
+IP: 
 PORT: 56400
-PASSPHRASE: passw0rd
+PASSPHRASE:
 GROUP_HANGTIME: 5
 USE_ACL: True
 REG_ACL: DENY:1
@@ -69,14 +66,14 @@ ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
 OVERRIDE_IDENT_TG:
 
-#Echo (Loro / Parrot) server
+
 [ECHO]
 MODE: PEER
 ENABLED: True
 LOOSE: False
 EXPORT_AMBE: False
 IP: 127.0.0.1
-PORT: 54916
+PORT: 54917
 MASTER_IP: 127.0.0.1
 MASTER_PORT: 54915
 PASSPHRASE: passw0rd
@@ -103,3 +100,32 @@ TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 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:
+
+
+

config/ADN-SAMPLE-commented.cfg

@@ -102,22 +102,24 @@ LOG_NAME: ADN
 # HBlink to use, and will NOT be used in HBlink directly.
 # 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.
+
 [ALIASES]
 TRY_DOWNLOAD: True
-PATH: ./data
+PATH: ./data/
 PEER_FILE: peer_ids.json
 SUBSCRIBER_FILE: subscriber_ids.json
 TGID_FILE: talkgroup_ids.json
 PEER_URL: https://adn.systems/files/peer_ids.json
 SUBSCRIBER_URL: https://adn.systems/files/subscriber_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_FILE: server_ids.tsv
 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
+KEYS_FILE: keys.json
 
 #Control server shared allstar instance via dial / AMI
 [ALLSTAR]
@@ -158,6 +160,7 @@ TABLE: repeaters
 # Otherwise ACLs work as described in the global stanza
 #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]
 MODE: OPENBRIDGE
 ENABLED: False
@@ -195,13 +198,14 @@ 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]
 MODE: MASTER
 ENABLED: True
 REPEAT: True
 MAX_PEERS: 1
 EXPORT_AMBE: False
-IP: 127.0.0.1
+IP: 
 PORT: 56400
 PASSPHRASE:
 GROUP_HANGTIME: 5
@@ -222,19 +226,19 @@ ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
 OVERRIDE_IDENT_TG:
 
-#Echo (Loro / Parrot) server
+
 [ECHO]
 MODE: PEER
 ENABLED: True
 LOOSE: False
 EXPORT_AMBE: False
 IP: 127.0.0.1
-PORT: 54916
+PORT: 54917
 MASTER_IP: 127.0.0.1
 MASTER_PORT: 54915
 PASSPHRASE: passw0rd
 CALLSIGN: ECHO
-RADIO_ID: 1000001
+RADIO_ID: 9990
 RX_FREQ: 449000000
 TX_FREQ: 444000000
 TX_POWER: 25
@@ -255,3 +259,33 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 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:
+
+
+

config/ADN-SAMPLE.cfg

@@ -14,7 +14,6 @@ SERVER_ID: 0000
 DATA_GATEWAY: False
 VALIDATE_SERVER_IDS: True
 
-
 [REPORTS]
 REPORT: True
 REPORT_INTERVAL: 60
@@ -22,28 +21,28 @@ REPORT_PORT: 4321
 REPORT_CLIENTS: 127.0.0.1
 
 [LOGGER]
-LOG_FILE: adn.log
+LOG_FILE: /dev/null
 LOG_HANDLERS: console-timed
-LOG_LEVEL: INFO
+LOG_LEVEL: DEBUG
 LOG_NAME: ADN
 
 [ALIASES]
 TRY_DOWNLOAD: True
-PATH: ./data
+PATH: ./data/
 PEER_FILE: peer_ids.json
 SUBSCRIBER_FILE: subscriber_ids.json
 TGID_FILE: talkgroup_ids.json
 PEER_URL: https://adn.systems/files/peer_ids.json
 SUBSCRIBER_URL: https://adn.systems/files/subscriber_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_FILE: server_ids.tsv
 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
-
+KEYS_FILE: keys.json
 
 #Control server shared allstar instance via dial / AMI
 [ALLSTAR]
@@ -54,39 +53,29 @@ SERVER: my.asl.server
 PORT: 5038
 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]
 MODE: OPENBRIDGE
 ENABLED: False
 IP:
 PORT: 62044
-#The ID which you expect to see sent from the other end of the link. 
 NETWORK_ID: 1
 PASSPHRASE: mypass
 TARGET_IP: 
 TARGET_PORT: 62044
 USE_ACL: True
 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
-#True for FBP, False for OBP
 ENHANCED_OBP: True
-#PROTO_VER should be 5 for ADN-Systems servers using FBP
-#1 for other servers using OBP
 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]
 MODE: MASTER
 ENABLED: True
 REPEAT: True
 MAX_PEERS: 1
 EXPORT_AMBE: False
-IP: 127.0.0.1
+IP: 
 PORT: 56400
 PASSPHRASE:
 GROUP_HANGTIME: 5
@@ -107,14 +96,14 @@ ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
 OVERRIDE_IDENT_TG:
 
-#Echo (Loro / Parrot) server
+
 [ECHO]
 MODE: PEER
 ENABLED: True
 LOOSE: False
 EXPORT_AMBE: False
 IP: 127.0.0.1
-PORT: 54916
+PORT: 54917
 MASTER_IP: 127.0.0.1
 MASTER_PORT: 54915
 PASSPHRASE: passw0rd
@@ -140,3 +129,33 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 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:
+
+
+

docker-configs/docker-compose.yml

@@ -25,7 +25,6 @@ services:
         mem_reservation: 600m
         volumes:
             - '/etc/ADN-Systems/adn.cfg:/opt/ADN-DMR-Peer-Server/config/adn.cfg'
-
         ports:
             - '62031:62031/udp'
             #Change the below to inlude ports used for your OBP(s)
@@ -33,9 +32,10 @@ services:
             - '8000:8000'
         image: 'registry.gitlab.com/hp3icc/fdmr/adn-server-single:latest'
         restart: "unless-stopped"
+        logging:
+          driver: none
         networks:
-           app_net:
+          - bridge
-             ipv4_address: 172.16.238.10
         #Control parameters inside container
         environment:
             #IPV6 support 
@@ -74,17 +74,12 @@ services:
 
           #Note -the gencert.sh script only works when the webserver is available on the default port 80  
           #If it's on non-standard ports, you'll need to request the certificates manually. 
-        networks:
-           app_net:
-             ipv4_address: 172.16.238.20
         logging:
-              driver: json-file
+          driver: none
+        networks:
+          - bridge
 
 networks:
-  app_net:
+  bridge:
     driver: bridge
-    ipam:
+
-      driver: default
-      config:
-        - subnet: 172.16.238.0/24
-          gateway: 172.16.238.1

docker-configs/docker-compose_install.sh

@@ -120,7 +120,7 @@ ENABLED: True
 LOOSE: False
 EXPORT_AMBE: False
 IP: 127.0.0.1
-PORT: 54916
+PORT: 54917
 MASTER_IP: 127.0.0.1
 MASTER_PORT: 54915
 PASSPHRASE: passw0rd
@@ -147,6 +147,34 @@ TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 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:
+
+
 EOF
 #
 echo Install /etc/ADN-Systems/fdmr-mon.cfg ... 
@@ -165,7 +193,7 @@ TGCOUNT_ROWS = 20
 
 [FDMR CONNECTION]
 # FDMR server's IP Address or hostname
-FDMR_IP = 172.16.238.10
+FDMR_IP = adn-server
 # FDMR server's TCP reporting socket
 FDMR_PORT = 4321