From fb21909b0563bd0f33b2bd99bfd204415f78a7f3 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sat, 8 Apr 2017 23:14:10 +0100
Subject: [PATCH] Adding the new files for testing

---
 lgsm/config/common-template.cfg     |   5 ++
 lgsm/config/csgoserver/_default.cfg | 119 ++++++++++++++++++++++++++++
 lgsm/config/instance-template.cfg   |   5 ++
 lgsm/data/serverlist.csv            |  68 ++++++++++++++++
 lgsm/functions/fn_functions         |  20 -----
 lgsm/functions/fn_getopt            |  15 ----
 lgsm/functions/fn_update_functions  |  21 -----
 lgsminstall => lgsminstall.sh       |   0
 8 files changed, 197 insertions(+), 56 deletions(-)
 create mode 100644 lgsm/config/common-template.cfg
 create mode 100644 lgsm/config/csgoserver/_default.cfg
 create mode 100644 lgsm/config/instance-template.cfg
 create mode 100644 lgsm/data/serverlist.csv
 delete mode 100644 lgsm/functions/fn_functions
 delete mode 100644 lgsm/functions/fn_getopt
 delete mode 100644 lgsm/functions/fn_update_functions
 rename lgsminstall => lgsminstall.sh (100%)

diff --git a/lgsm/config/common-template.cfg b/lgsm/config/common-template.cfg
new file mode 100644
index 000000000..ddb1ef233
--- /dev/null
+++ b/lgsm/config/common-template.cfg
@@ -0,0 +1,5 @@
+##################################
+######## Common Settings #########
+##################################
+# PLACE GLOBAL SETTINGS HERE
+## These settings will apply to all instances
diff --git a/lgsm/config/csgoserver/_default.cfg b/lgsm/config/csgoserver/_default.cfg
new file mode 100644
index 000000000..74c1f69e8
--- /dev/null
+++ b/lgsm/config/csgoserver/_default.cfg
@@ -0,0 +1,119 @@
+##################################
+######## Default Settings ########
+##################################
+# DO NOT EDIT WILL BE OVERWRITTEN!
+
+#### Server Settings ####
+
+## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters
+# https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
+# [Game Modes]				gametype	gamemode
+# Arms Race					1			0
+# Classic Casual			0			0
+# Classic Competitive		0			1
+# Demolition				1			1
+# Deathmatch				1			2
+gametype="0"
+gamemode="0"
+defaultmap="de_mirage"
+mapgroup="mg_active"
+maxplayers="16"
+tickrate="64"
+port="27015"
+sourcetvport="27016"
+clientport="27017"
+ip="0.0.0.0"
+
+## Required: Game Server Login Token
+# GSLT is required for running a public server.
+# More info: https://gameservermanagers.com/gslt
+gslt=""
+
+## Optional: Workshop Parameters
+# https://developer.valvesoftware.com/wiki/CSGO_Workshop_For_Server_Operators
+# To get an authkey visit - http://steamcommunity.com/dev/apikey
+authkey=""
+ws_collection_id=""
+ws_start_map=""
+
+## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
+fn_parms(){
+parms="-game csgo -usercon -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +sv_setsteamaccount ${gslt} -tickrate ${tickrate} +map ${defaultmap} +servercfgfile ${servercfg} -maxplayers_override ${maxplayers} +mapgroup ${mapgroup} +game_mode ${gamemode} +game_type ${gametype} +host_workshop_collection ${ws_collection_id} +workshop_start_map ${ws_start_map} -authkey ${authkey}"
+}
+
+#### LinuxGSM Settings ####
+
+## Notification Alerts
+# (on|off)
+# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email
+emailalert="off"
+email="email@example.com"
+emailfrom=""
+
+# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet
+pushbulletalert="off"
+pushbullettoken="accesstoken"
+channeltag=""
+
+## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update
+updateonstart="off"
+
+## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup
+maxbackups="4"
+maxbackupdays="30"
+stoponbackup="on"
+
+## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging
+consolelogging="on"
+logdays="7"
+
+#### LinuxGSM Advanced Settings ####
+
+## SteamCMD Settings
+# Server appid
+appid="740"
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta latest_experimental"
+branch=""
+
+## LinuxGSM Server Details
+# Do not edit
+gamename="Counter-Strike: Global Offensive"
+engine="source"
+
+#### Directories ####
+# Edit with care
+
+## Work Directories
+
+lockselfname=".${servicename}.lock"
+lgsmdir="${rootdir}/lgsm"
+functionsdir="${lgsmdir}/functions"
+libdir="${lgsmdir}/lib"
+tmpdir="${lgsmdir}/tmp"
+filesdir="${rootdir}/serverfiles"
+
+## Server Specific Directories
+systemdir="${filesdir}/csgo"
+executabledir="${filesdir}"
+executable="./srcds_run"
+servercfg="${servicename}.cfg"
+servercfgdefault="server.cfg"
+servercfgdir="${systemdir}/cfg"
+servercfgfullpath="${servercfgdir}/${servercfg}"
+
+## Backup Directory
+backupdir="${rootdir}/backups"
+
+## Logging Directories
+gamelogdir="${systemdir}/logs"
+scriptlogdir="${rootdir}/log/script"
+consolelogdir="${rootdir}/log/console"
+scriptlog="${scriptlogdir}/${servicename}-script.log"
+consolelog="${consolelogdir}/${servicename}-console.log"
+emaillog="${scriptlogdir}/${servicename}-email.log"
+
+## Logs Naming
+scriptlogdate="${scriptlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
+consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
\ No newline at end of file
diff --git a/lgsm/config/instance-template.cfg b/lgsm/config/instance-template.cfg
new file mode 100644
index 000000000..69646e3a7
--- /dev/null
+++ b/lgsm/config/instance-template.cfg
@@ -0,0 +1,5 @@
+##################################
+######## Instance Settings ########
+##################################
+# PLACE INSTANCE SETTINGS HERE
+## These settings will apply to a specific instance
\ No newline at end of file
diff --git a/lgsm/data/serverlist.csv b/lgsm/data/serverlist.csv
new file mode 100644
index 000000000..d9a27de49
--- /dev/null
+++ b/lgsm/data/serverlist.csv
@@ -0,0 +1,68 @@
+arma3,arma3server,ARMA 3
+sdtd,sdtdserver,7 Days to Die
+ark,arkserver,ARK: Survival Evolved
+bo,boserver,Ballistic Overkill
+bf1942,bf1942server,Battlefield 1942
+bmdm,bmdmserver,Black Mesa: Deathmatch
+bs,bsserver,Blade Symphony
+bb2,bb2server,BrainBread 2
+cod,codserver,Call of Duty
+cod2,cod2server,Call of Duty 2
+cod4,cod4server,Call of Duty 4
+coduo,coduoserver,Call of Duty: United Offensive
+codwaw,codwawserver,Call of Duty: World at War
+cc,ccserver,Codename CURE
+cs,csserver,Counter-Strike 1.6
+cscz,csczserver,Counter-Strike: Condition Zero
+csgo,csgoserver,Counter-Strike: Global Offensive
+css,cssserver,Counter-Strike: Source
+dod,dodserver,Day of Defeat
+dods,dodsserver,Day of Defeat: Source
+doi,doiserver,Day of Infamy
+dmc,dmcserver,Deathmatch Classic
+dst,dstserver,Don't Starve Together
+dab,dabserver,Double Action: Boogaloo
+em,emserver,Empires Mod
+fctr,fctrserver,Factorio
+fof,fofserver,Fistful of Frags
+gmod,gmodserver,Garrys Mod
+ges,gesserver,GoldenEye: Source
+hl2dm,hl2dmserver,Half-Life 2: Deathmatch
+hldms,hldmsserver,Half-Life Deathmatch: Source
+hldm,hldmserver,Half-Life: Deathmatch
+hw,hwserver,Hurtworld
+ins,insserver,Insurgency
+jc2,jc2server,Just Cause 2
+kf,kfserver,Killing Floor
+l4d,l4dserver,Left 4 Dead
+l4d2,l4d2server,Left 4 Dead 2
+mc,mcserver,Minecraft
+mta,mtaserver,Multi Theft Auto
+mumble,mumbleserver,Mumble
+ns2,ns2server,Natural Selection 2
+nmrih,nmrihserver,No More Room in Hell
+ns2c,ns2cserver,NS2: Combat
+opfor,opforserver,Opposing Force
+pvkii,pvkiiserver,"Pirates, Vikings, & Knights II"
+pc,pcserver,Project Cars
+pz,pzserver,Project Zomboid
+q2,q2server,Quake 2
+q3,q3server,Quake 3: Arena
+ql,qlserver,Quake Live
+qw,qwserver,Quake World
+ro,roserver,Red Orchestra: Ostfront 41-45
+ricochet,ricochetserver,Ricochet
+rust,rustserver,Rust
+ss3,ss3server,Serious Sam 3: BFE
+sb,sbserver,Starbound
+sven,svenserver,Sven Co-op
+tf2,tf2server,Team Fortress 2
+tfc,tfcserver,Team Fortress Classic
+ts3,ts3server,Teamspeak 3
+tw,twserver,Teeworlds
+terraria,terrariaserver,Terraria
+tu,tuserver,Tower Unite
+ut2k4,ut2k4server,Unreal Tournament 2004
+ut3,ut3server,Unreal Tournament 3
+ut99,ut99server,Unreal Tournament 99
+wet,wetserver,Wolfenstein: Enemy Territory
diff --git a/lgsm/functions/fn_functions b/lgsm/functions/fn_functions
deleted file mode 100644
index ca45dd740..000000000
--- a/lgsm/functions/fn_functions
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# LinuxGSM fn_functions function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-lgsm_version="211016"
-
-# Description: Redirects to new core_functions.sh
-
-core_functions.sh(){
-# Functions are defined in core_functions.sh.
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
-core_getopt.sh(){
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
-core_functions.sh
\ No newline at end of file
diff --git a/lgsm/functions/fn_getopt b/lgsm/functions/fn_getopt
deleted file mode 100644
index e15a29201..000000000
--- a/lgsm/functions/fn_getopt
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# LinuxGSM fn_getopt function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-lgsm_version="211016"
-
-# Description: Redirect to new core_getopt.sh
-
-core_getopt.sh(){
-# Functions are defined in core_functions.sh.
-functionfile="${FUNCNAME}"
-fn_runfunction
-}
-
-core_getopt.sh
\ No newline at end of file
diff --git a/lgsm/functions/fn_update_functions b/lgsm/functions/fn_update_functions
deleted file mode 100644
index 7dbde6694..000000000
--- a/lgsm/functions/fn_update_functions
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# LinuxGSM fn_update_functions function
-# Author: Daniel Gibbs
-# Website: https://gameservermanagers.com
-lgsm_version="211016"
-
-# Description: LEGACY FUNCTION Deletes the functions dir to allow re-downloading of functions from GitHub.
-
-fn_print_dots "Updating functions"
-sleep 1
-echo -ne "\n"
-rm -rfv "${rootdir}/functions/"*
-exitcode=$?
-if [ "${exitcode}" == "0" ]; then
-	fn_print_ok "Updating functions"
-	fn_script_log "Success! Updating functions"
-else
-	fn_print_fail "Updating functions"
-	fn_script_log "Failure! Updating functions"
-fi
-echo -ne "\n"
\ No newline at end of file
diff --git a/lgsminstall b/lgsminstall.sh
similarity index 100%
rename from lgsminstall
rename to lgsminstall.sh