Merge branch 'release/0.3'

Makefile

@@ -19,7 +19,7 @@
 export BIN_DIR=/usr/local/bin
 export CFG_DIR=/usr/local/etc/
 export DATA_DIR=/usr/local/share/dstargateway.d/
-export LOG_DIR=/var/log/dstargateway
+export LOG_DIR=/var/log/dstargateway/
 
 # choose this if you want debugging help
 CPPFLAGS=-g -ggdb -W -Wall -std=c++17
@@ -86,8 +86,8 @@ install : dstargateway
 
 # copy and adjust config
 	@cp -fn example.cfg $(CFG_DIR)/dstargateway.cfg
-	@sed -i "s|log=.*|log=\"$(LOG_DIR)\"|g" $(CFG_DIR)/dstargateway.cfg
+	@sed -i "s|path=/var/log/dstargateway/|path=$(LOG_DIR)|g" $(CFG_DIR)/dstargateway.cfg
-	@sed -i "s|data=.*|data=\"$(DATA_DIR)\"|g" $(CFG_DIR)/dstargateway.cfg
+	@sed -i "s|data=/usr/local/share/dstargateway.d/|data=$(DATA_DIR)|g" $(CFG_DIR)/dstargateway.cfg
 
 # copy binary
 	@cp -f dstargateway $(BIN_DIR)

example.cfg

@@ -9,26 +9,26 @@ callsign=
 address=0.0.0.0	        # this is the computer interface for the outgoing connection. Usually leave it blank and it will use whatever is avaiable.
 icomAddress=172.16.0.20 
 icomPort=20000          
-hbAddress=              #address to use for connecting to the homebrew repeaters (MMDVMHost, DStarRepeater), defaults to 127.0.0.1
+hbAddress=             #address to use for connecting to the homebrew repeaters (MMDVMHost, DStarRepeater), defaults to 127.0.0.1
 hbPort=20010
 latitude=0.0
 longitude=0.0
 description1=
 description2=
 url=
-language=               # valid values: english_uk, deutsch, dansk, francais, italiano, polski, english_us, espanol, svenska, nederlands_nl, nederlands_be, norsk, portugues
+language=              # valid values: english_uk, deutsch, dansk, francais, italiano, polski, english_us, espanol, svenska, nederlands_nl, nederlands_be, norsk, portugues
 
 #up to 4 ircddb networks can be specified
 [ircddb_1]
 enabled=true
 hostname=ircv4.openquad.net
-username=               # The ircDDB username default to the value defined for gateway callsign.
+username=              # The ircDDB username default to the value defined for gateway callsign.
 password=
 
 [ircddb_2]
 enabled=false
 hostname=
-username=               # The ircDDB username defaults to the value defined for gateway callsign.
+username=              # The ircDDB username defaults to the value defined for gateway callsign.
 password=
 
 [ircddb_3]
@@ -45,12 +45,12 @@ password=
 [Repeater_1]
 enabled=true
 band=B                  # Each module has to have a band letter
-callsign=               # Has to be less than 8 characters, if empty gateway call will be used
+callsign=              # Has to be less than 8 characters, if empty gateway call will be used
 address=		        # address where the repeater can be found, if left empty defaults to 127.0.0.1
 port=20011
 type=hb                 # valid values: hb or icom
 reflector=
-reflectorAtStartup=     # if reflector is set, this defaults to true
+reflectorAtStartup=    # if reflector is set, this defaults to true
 reflectorReconnect=30   # valid values: never, fixed, 5, 10, 15, 20, 25, 30, 60, 90, 120, 180
 frequency=434.0
 offset=-1.6
@@ -68,7 +68,7 @@ band3=
 [Repeater_2]
 enabled=false
 band=			# Each module has to have a band letter
-callsign= 		# Has to be less than 8 characters, if empty gateway call will be used
+callsign=		# Has to be less than 8 characters, if empty gateway call will be used
 address=		# address where the repeater can be found, if left empty defaults to 127.0.0.1
 port=20012
 type=hb			# hb or icom
@@ -91,11 +91,11 @@ band3=
 [Repeater_3]
 enabled=false
 band=			# Each module has to have a band letter
-callsign= 		# Has to be less than 8 characters, if empty gateway call will be used
+callsign=		# Has to be less than 8 characters, if empty gateway call will be used
 address=		# address where the repeater can be found, if left empty defaults to 127.0.0.1
 port=20013
 type=hb			# hb or icom
-reflector=DCS208 C
+reflector=
 reflectorAtStartup=true
 reflectorReconnect=30 # never, fixed, 5, 10, 15, 20, 25, 30, 60, 90, 120, 180
 frequency=434.0
@@ -114,11 +114,11 @@ band3=
 [Repeater_4]
 enabled=false
 band=			# Each module has to have a band letter
-callsign= 		# Has to be less than 8 characters, if empty gateway call will be used
+callsign=		# Has to be less than 8 characters, if empty gateway call will be used
 address=		# address where the repeater can be found, if left empty defaults to 127.0.0.1
 port=20014
 type=hb			# hb or icom
-reflector=DCS208 C
+reflector=
 reflectorAtStartup=true
 reflectorReconnect=30 # never, fixed, 5, 10, 15, 20, 25, 30, 60, 90, 120, 180
 frequency=434.0
@@ -136,8 +136,8 @@ band3=
 
 [APRS]
 enabled=true
-hostname=rotate.aprs2.net # Defaults to rotate.aprs2.net
+hostname=rotate.aprs2.net   # Defaults to rotate.aprs2.net
-port=14580 				  # Defaults to 14580, there is no reason to change this
+port=14580                  # Defaults to 14580, there is no reason to change this
 password=12345
 
 [Log]