ShaYmez
/
IPSCConnect
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update compose file

This commit is contained in:
Simon 2021-09-12 20:12:02 +01:00
parent 03255a53e7
commit 1f9b9d1de3
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/DMRGateway.ini
View File

@ -80,11 +80,10 @@ TypeRewrite=2,4000,2,4000
PassAllTG=1 PassAllTG=1
PassAllTG=2 PassAllTG=2
Password=passw0rd Password=passw0rd
Location=1 Location=1
Debug=0 Debug=0
Options={{DMRG_OPTIONS}}

4
config/dmrlink.cfg
View File

@ -165,12 +165,12 @@ MASTER_PORT: 50000
GROUP_HANGTIME: 5 GROUP_HANGTIME: 5
[DEFAULTS] [IPSC_Bridge]
ENABLED: True ENABLED: True
RADIO_ID: {{IPSC_RADIO_ID}} RADIO_ID: {{IPSC_RADIO_ID}}
IP: IP:
PORT: 55000 PORT: 55000
ALIVE_TIMER: 10 ALIVE_TIMER: 6
MAX_MISSED: 20 MAX_MISSED: 20
PEER_OPER: True PEER_OPER: True
IPSC_MODE: DIGITAL IPSC_MODE: DIGITAL

4
config/hblink.cfg
View File

@ -80,7 +80,7 @@ GROUP_HANGTIME: 5
# Setting Loose to True relaxes the validation on packets received from the master. # Setting Loose to True relaxes the validation on packets received from the master.
# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc. # This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
[DMRGATEWAY] [HB_Bridge]
MODE: CLIENT MODE: CLIENT
ENABLED: True ENABLED: True
LOOSE: True LOOSE: True
@ -96,7 +96,7 @@ RX_FREQ: {{HB_RX_FREQ}}
TX_FREQ: {{HB_TX_FREQ}} TX_FREQ: {{HB_TX_FREQ}}
TX_POWER: {{HB_TX_POWER}} TX_POWER: {{HB_TX_POWER}}
COLORCODE: {{HB_COLORCODE}} COLORCODE: {{HB_COLORCODE}}
SLOTS: 3 SLOTS: {{HB_SLOTS}}
LATITUDE: {{HB_LAT}} LATITUDE: {{HB_LAT}}
LONGITUDE: {{HB_LON}} LONGITUDE: {{HB_LON}}
HEIGHT: {{HB_HEIGHT}} HEIGHT: {{HB_HEIGHT}}

12
docker-compose.yml
View File

@ -27,7 +27,7 @@ services:
- IPSC_MASTER_IP= - IPSC_MASTER_IP=
- IPSC_MASTER_PORT= - IPSC_MASTER_PORT=
#Which timeslots to forward #Which timeslots to forward
- IPSC_TS1=False - IPSC_TS1=True
- IPSC_TS2=True - IPSC_TS2=True
#DMR ID we use to talk to the IPSC network #DMR ID we use to talk to the IPSC network
#This should probably be the repeater server's SERVER_ID #This should probably be the repeater server's SERVER_ID
@ -44,9 +44,15 @@ services:
- 'HB_LON=-' - 'HB_LON=-'
- HB_HEIGHT= - HB_HEIGHT=
- HB_LOCATION= - HB_LOCATION=
#Put an Options line here to configure static TGs etc #Which slots to enable:
- HB_OPTIONS= # 1 = 1, 2 = 2, 3 = both
# Note there are some issues with both slots
# at this time.
# Slot 2 is setup to work with dial-a-tg **only**
- HB_SLOTS=1
#Configure Repeater server side (DMRGateway) #Configure Repeater server side (DMRGateway)
#Put an Options line here to configure static TGs etc
- 'DMRG_OPTIONS='
#Target server #Target server
- DMRG_TARGET= - DMRG_TARGET=
image: 'hacknix/freedmr-ipsc:latest' image: 'hacknix/freedmr-ipsc:latest'

3
entrypoint
View File

@ -22,8 +22,9 @@ sed -i "s/{{HB_LAT}}/$HB_LAT/" /opt/hblink.cfg
sed -i "s/{{HB_LON}}/$HB_LON/" /opt/hblink.cfg sed -i "s/{{HB_LON}}/$HB_LON/" /opt/hblink.cfg
sed -i "s/{{HB_HEIGHT}}/$HB_HEIGHT/" /opt/hblink.cfg sed -i "s/{{HB_HEIGHT}}/$HB_HEIGHT/" /opt/hblink.cfg
sed -i "s/{{HB_LOCATION}}/$HB_LOCATION/" /opt/hblink.cfg sed -i "s/{{HB_LOCATION}}/$HB_LOCATION/" /opt/hblink.cfg
sed -i "s/{{HB_OPTIONS}}/$HB_OPTIONS/" /opt/hblink.cfg sed -i "s/{{HB_SLOTS}}/$HB_SLOTS/" /opt/hblink.cfg
sed -i "s/{{DMRG_OPTIONS}}/$DMRG_OPTIONS/" /opt/DMRGateway.ini
sed -i "s/{{DMRG_TARGET}}/$DMRG_TARGET/" /opt/DMRGateway.ini sed -i "s/{{DMRG_TARGET}}/$DMRG_TARGET/" /opt/DMRGateway.ini
#Run processes #Run processes