Merge branch 'develop' into feature/2914-rust-app

lgsm/config-default/config-lgsm/rustserver/_default.cfg

@@ -13,6 +13,7 @@
 ip="0.0.0.0"
 port="28015"
 rconport="28016"
+appport=28082
 rconpassword="CHANGE_ME"
 rconweb="1" # Value is: 1 for Facepunch's web panel; 0 for RCON tools like Rusty or Rustadmin
 servername="Rust"
@@ -42,7 +43,7 @@ else
 	# Keep randomness of the number if not set
 	conditionalsalt=""
 fi
-parms="-batchmode +app.port +app.listenip ${ip} +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${selfname}\" ${conditionalseed} ${conditionalsalt} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile"
+parms="-batchmode +app.listenip ${ip} +app.port ${appport} +server.ip ${ip} +server.port ${port} +server.tickrate ${tickrate} +server.hostname \"${servername}\" +server.identity \"${selfname}\" ${conditionalseed} ${conditionalsalt} +server.maxplayers ${maxplayers} +server.worldsize ${worldsize} +server.saveinterval ${saveinterval} +rcon.web ${rconweb} +rcon.ip ${ip} +rcon.port ${rconport} +rcon.password \"${rconpassword}\" -logfile"
 }
 
 #### LinuxGSM Settings ####