diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver index b581812e2..d05305a0d 100644 --- a/Mumble/mumbleserver +++ b/Mumble/mumbleserver @@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="270716" +version="290716" #### Variables #### @@ -26,6 +26,23 @@ email="email@example.com" pushbulletalert="off" pushbullettoken="accesstoken" +# Start Variables +updateonstart="off" + +fn_parms(){ +parms="-fg -ini ${servercfgfullpath}" +} + +#### Advanced Variables #### + +# Github Branch Select +# Allows for the use of different function files +# from a different repo and/or branch. +githubuser="dgibbs64" +githubrepo="linuxgsm" +githubbranch="master" + + # Server Details gamename="Mumble" servicename="mumble-server" @@ -44,6 +61,7 @@ servercfg="murmur.ini" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" backupdir="${rootdir}/backups" + if [ -f "${servercfgfullpath}" ]; then port=$(cat "${servercfgfullpath}" | grep 'port=' | awk -F'=' '{ print $2 }') servername="Mumble Port ${port}" @@ -54,7 +72,7 @@ fi # Logging logdays="7" -logdir="${rootdir}/log" +gamelogdir="${rootdir}/log" scriptlogdir="${rootdir}/log/script" consolelogdir="${rootdir}/log/console" consolelogging="on" @@ -66,17 +84,6 @@ emaillog="${scriptlogdir}/${servicename}-email.log" scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%d-%m-%Y-%H-%M-%S').log" consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M-%S').log" -fn_parms(){ -parms="-fg -ini ${servercfgfullpath}" -} - -# Github Branch Select -# Allows for the use of different function files -# from a different repo and/or branch. -githubuser="dgibbs64" -githubrepo="linuxgsm" -githubbranch="master" - ##### Script ##### # Do not edit