From 9b6154de4795efc5bbf0d2abb5505242fdadf177 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 30 May 2020 10:09:56 +0100
Subject: [PATCH] changes to default.cfg

---
 .../config-lgsm/rustserver/_default.cfg       | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/rustserver/_default.cfg b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
index cf70cdae7..ec2df7331 100644
--- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
@@ -9,38 +9,26 @@
 #### Game Server Settings ####
 
 ## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
-# More settings available after install in serverfiles/server/rust-server/server.cfg
 ip="0.0.0.0"
 port="28015"
 rconport="28016"
 rconpassword="CHANGE_ME"
-rconweb="1" # Value is: 1 for Facepunch's web panel; 0 for RCON tools like Rusty or Rustadmin
+rconweb="1" # Value is: 1 for the Facepunch web panel; 0 for RCON tools like Rusty or Rustadmin.
 servername="Rust"
 maxplayers="50"
-
-# Advanced Start Settings
-seed="" # default random; range : 1 to 2147483647 ; used to change or reproduce a procedural map
-salt="" # default random; range : unknown range ; used to recover a known setting from an existing map
-worldsize="3000" # default 3000; range : 1000 to 6000 ; map size in meters
-saveinterval="300" # Auto-save in seconds
-tickrate="30" # default 30; range : 15 to 100
+seed="random" # default: random, range: 1-2147483647, used to reproduce a procedural map.
+salt="random" # default: random, range: unknown, used to recover a known setting from an existing map.
+worldsize="3000" # default: 3000, range: 1000-6000, map size in meters.
+saveinterval="300" # Auto-save in seconds.
+tickrate="30" # default: 30, range: 15-100.
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-# Specific to Rust
-if [ "${seed}" ]; then
-	# If set, then add to start parms
+if [ "${seed}" ]||[ "${seed}" != "random" ]; then
 	conditionalseed="+server.seed ${seed}"
-else
-	# Keep randomness of the number if not set
-	conditionalseed=""
 fi
-if [ "${salt}" ]; then
-	# If set, then add to start parms
+if [ "${salt}" ]||[ "${salt}" != "random" ]; then
 	conditionalsalt="+server.salt ${salt}"
-else
-	# Keep randomness of the number if not set
-	conditionalsalt=""
 fi
 parms="-batchmode +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 \"${gamelogdate}\""
 }
@@ -174,11 +162,12 @@ glibc="2.15"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executable="./RustDedicated"
-serveridentitydir="${systemdir}/server/${selfname}"
+
 servercfgdir="${serveridentitydir}/cfg"
 servercfg="server.cfg"
 servercfgdefault="server.cfg"
 servercfgfullpath="${servercfgdir}/${servercfg}"
+serveridentitydir="${systemdir}/server/${selfname}"
 
 ## Backup Directory
 backupdir="${lgsmdir}/backup"