diff --git a/config/DMRGateway.ini b/config/DMRGateway.ini index d0c39ab..92c743c 100644 --- a/config/DMRGateway.ini +++ b/config/DMRGateway.ini @@ -21,7 +21,7 @@ Debug=0 [Log] # Logging levels, 0=No logging DisplayLevel=1 -FileLevel=1 +FileLevel=0 FilePath=. FileRoot=DMRGateway FileRotate=1 diff --git a/config/dmrlink.cfg b/config/dmrlink.cfg index 57c37fb..30729d6 100644 --- a/config/dmrlink.cfg +++ b/config/dmrlink.cfg @@ -185,7 +185,7 @@ DATA_CALL: True VOICE_CALL: True MASTER_PEER: {{IPSC_MASTER_PEER}} AUTH_ENABLED: False -AUTH_KEY: +AUTH_KEY: {{IPSC_AUTH_KEY}} # Below not used for a Master MASTER_IP: {{IPSC_MASTER_IP}} MASTER_PORT: {{IPSC_MASTER_PORT}} diff --git a/config/hblink.cfg b/config/hblink.cfg index a9ac222..fcd92c0 100644 --- a/config/hblink.cfg +++ b/config/hblink.cfg @@ -28,7 +28,7 @@ MAX_MISSED: 3 [LOGGER] LOG_FILE: /tmp/hblink.log LOG_HANDLERS: console-timed -LOG_LEVEL: DEBUG +LOG_LEVEL: INFO LOG_NAME: HBlink # DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES diff --git a/docker-compose.yml b/docker-compose.yml index 52e50e7..7832a0b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,6 +32,7 @@ services: #DMR ID we use to talk to the IPSC network #This should probably be the repeater server's SERVER_ID - IPSC_RADIO_ID=2341 + - IPSC_AUTH_KEY= #Configure HBP (repeater) details (HB_Bridge) - HB_CALLSIGN= - HB_RADIO_ID= diff --git a/entrypoint b/entrypoint index efb6cbe..52478c1 100755 --- a/entrypoint +++ b/entrypoint @@ -9,6 +9,8 @@ sed -i "s/{{IPSC_MASTER_PEER}}/$IPSC_MASTER_PEER/" /opt/dmrlink.cfg sed -i "s/{{IPSC_TS1}}/$IPSC_TS1/" /opt/dmrlink.cfg sed -i "s/{{IPSC_TS2}}/$IPSC_TS2/" /opt/dmrlink.cfg sed -i "s/{{IPSC_RADIO_ID}}/$IPSC_RADIO_ID/" /opt/dmrlink.cfg +sed -i "s/{{IPSC_AUTH_KEY}}/$IPSC_AUTH_KEY/" /opt/dmrlink.cfg + sed -i "s/{{HB_CALLSIGN}}/$HB_CALLSIGN/" /opt/hblink.cfg sed -i "s/{{HB_RADIO_ID}}/$HB_RADIO_ID/" /opt/hblink.cfg