Added external config support in cfg/servers directory. Loads _default.cfg which is managed by Git, then _common.cfg which is the user's common settings for all servers, then .cfg for the individual instances. Also cleaned up the function script calling to not change directory when functions are downloaded.

Insurgency/cfg/servers/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!_default.cfg

Insurgency/cfg/servers/_default.cfg

@@ -0,0 +1,22 @@
+# Default config - Changes will be overwritten by updates.
+# Your settings for all servers go in _common.cfg
+# Server-specific settings go into $SERVER.cfg
+appid="237410"
+beta="" #To enable beta, use " -beta beta"
+clientport="27005"
+defaultmap="ministry"
+defaultmode="checkpoint"
+email="[email protected]"
+emailnotification="off" # (on|off)
+ip="0.0.0.0"
+lgsm_version="031115"
+logdays="7"
+mapcyclefile="mapcycle.txt"
+maxplayers="16"
+playlist="custom"
+port="27015"
+sourcetvport="27020"
+srcds_parms=""
+steampass=""
+steamuser="anonymous"
+updateonstart="off"

Insurgency/insserver

@@ -3,46 +3,87 @@
 # Server Management Script
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-version="291015"
+version="031115"
 
 #### Variables ####
 
-# Notification Email
+# The name of this script file, used to show the LGSM link properly
-# (on|off)
+selfname=$(basename $(readlink -f "${BASH_SOURCE[0]}"))
-emailnotification="off"
-email="[email protected]"
 
-# Steam login
+# Directories
-steamuser="anonymous"
+rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-steampass=""
+scriptcfgdir="${rootdir}/cfg/servers"
+
+# Settings to get before config parsing begins
+engine="source"
+game="insurgency"
+gamename="Insurgency"
+servicename="$(basename $0)"
+
+#ipaddr=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1  -d'/')
 
-# Start Variables
+# Config files
+cfg_default="${scriptcfgdir}/_default.cfg"
+cfg_common="${scriptcfgdir}/_common.cfg"
+cfg_instance="${scriptcfgdir}/${servicename}.cfg"
+
+#If config directory does not exist, create it
+if [ ! -e $scriptcfgdir ]; then mkdir -p "$scriptcfgdir"; fi
+
+# If default config does not exist, create it. This should come from Git, and will be overwritten by updates.
+# Rather than try to wget it from Github or other fancy ways to get it, the simplest way to ensure it works is to simply create it here.
+fn_create_default_config(){
+cat <<'EOF' >> $cfg_default
+# Default config - Changes will be overwritten by updates.
+# Your settings for all servers go in _common.cfg
+# Server-specific settings go into $SERVER.cfg
+appid="237410"
+beta="" #To enable beta, use " -beta beta"
+clientport="27005"
 defaultmap="ministry"
+defaultmode="checkpoint"
+email="[email protected]"
+emailnotification="off" # (on|off)
+ip="0.0.0.0"
+lgsm_version="031115"
+logdays="7"
+mapcyclefile="mapcycle.txt"
 maxplayers="16"
+playlist="custom"
 port="27015"
 sourcetvport="27020"
-clientport="27005"
+srcds_parms=""
-ip="0.0.0.0"
+steampass=""
+steamuser="anonymous"
 updateonstart="off"
+EOF
+}
+if [ ! -f $cfg_default ]
+then
+	fn_create_default_config
+fi
+
+# Load defaults
+source $cfg_default
 
+#If defaults are from an older version, overwrite the file
+if [ "${lgsm_version}" != "${version}" ]; then fn_create_default_config; fi
+
+# Load sitewide common settings (so that Git updates can safely overwrite default.cfg)
+if [ ! -f $cfg_common ]; then touch $cfg_common; else source $cfg_common; fi
+
+# Load instance specific settings
+if [ ! -f $cfg_instance ]; then touch $cfg_instance; else source $cfg_instance; fi
+
+# Set the paramaters to send to srcds
 # https://developer.valvesoftware.com/wiki/Command_Line_Options#Source_Dedicated_Server
 fn_parms(){
-parms="-game insurgency -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+#TODO: Put in some conditional logic to handle generating the parm string so we can make this a little less game specific
+parms="-game ${game} -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_playlist ${playlist} +mapcyclefile ${mapcyclefile}+servercfgfile ${servercfg} +map ${defaultmap} ${defaultmode} -maxplayers ${maxplayers} ${srcds_parms}"
 }
 
 #### Advanced Variables ####
-
-# Steam
-appid="237410"
-
-# Server Details
-servicename="ins-server"
-gamename="Insurgency"
-engine="source"
-
 # Directories
-rootdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-selfname="$(basename $0)"
 lockselfname=".${servicename}.lock"
 filesdir="${rootdir}/serverfiles"
 systemdir="${filesdir}/insurgency"
@@ -54,8 +95,10 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
 servercfgdefault="${servercfgdir}/lgsm-default.cfg"
 backupdir="${rootdir}/backups"
 
+#In the event that you have library issues after an update, this may resolve it.
+#export LD_LIBRARY_PATH="${filesdir}:${filesdir}/bin:${LD_LIBRARY_PATH}"
+
 # Logging
-logdays="7"
 gamelogdir="${systemdir}/logs"
 scriptlogdir="${rootdir}/log/script"
 consolelogdir="${rootdir}/log/console"
@@ -71,19 +114,19 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-
 # Do not edit
 
 fn_runfunction(){
+functiondir="${rootdir}/functions"
+functionpath"${functiondir}/${functionfile}"
 # Functions are downloaded and run with this function
-if [ ! -f "${rootdir}/functions/${functionfile}" ]; then
+if [ ! -f "${functionpath}" ]; then
-	cd "${rootdir}"
+#	cd "${rootdir}"
-	if [ ! -d "functions" ]; then
+	if [ ! -d "${functiondir}" ]; then
-		mkdir functions
+		mkdir -p "${functiondir}"
 	fi
-	cd functions
 	echo -e "    loading ${functionfile}...\c"
-	wget -N /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/functions/${functionfile} 2>&1 | grep -F HTTP | cut -c45-
+	wget -N /dev/null "https://raw.githubusercontent.com/dgibbs64/linuxgsm/master/functions/${functionfile}" -O "${functionpath}" 2>&1 | grep -F HTTP | cut -c45-
-	chmod +x "${functionfile}"
+	chmod +x "${functionpath}"
-	cd "${rootdir}"
 fi
-source "${rootdir}/functions/${functionfile}"
+source "${functionpath}"
 }
 
 fn_functions(){