Merge branch 'release/190503'

GameServerManagers · May 3, 2019 · 1258789 · 1258789
2 parents 8185802 + c401b34
commit 1258789
Show file tree

Hide file tree

Showing 24 changed files with 359 additions and 129 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1,108 +1,119 @@
 {
-	"files": [
-		"README.md"
-	],
-	"imageSize": 100,
-	"commit": false,
-	"contributors": [{
-			"login": "dgibbs64",
-			"name": "Daniel Gibbs",
-			"avatar_url": "https://avatars2.githubusercontent.com/u/4478206?v=4",
-			"profile": "https://danielgibbs.co.uk",
-			"contributions": [
-				"bug",
-				"code",
-				"ideas",
-				"question",
-				"review",
-				"content",
-				"doc",
-				"infra"
-			]
-		},
-		{
-			"login": "Frisasky",
-			"name": "Frisasky",
-			"avatar_url": "https://avatars2.githubusercontent.com/u/26865851?v=4",
-			"profile": "https://github.com/Frisasky",
-			"contributions": [
-				"question",
-				"bug",
-				"code"
-			]
-		},
-		{
-			"login": "kennyLtv",
-			"name": "Kenny Lindelof",
-			"avatar_url": "https://avatars2.githubusercontent.com/u/6133325?v=4",
-			"profile": "https://kennyl.design",
-			"contributions": [
-				"question"
-			]
-		},
-		{
-			"login": "Scarsz",
-			"name": "Austin Shapiro",
-			"avatar_url": "https://avatars1.githubusercontent.com/u/7691988?v=4",
-			"profile": "https://scarsz.me",
-			"contributions": [
-				"bug",
-				"code"
-			]
-		},
-		{
-			"login": "marvinlehmann",
-			"name": "Marvin Lehmann",
-			"avatar_url": "https://avatars2.githubusercontent.com/u/4151266?v=4",
-			"profile": "https://github.com/marvinlehmann",
-			"contributions": [
-				"bug",
-				"code"
-			]
-		},
-		{
-			"login": "Bourne-ID",
-			"name": "Bourne-ID",
-			"avatar_url": "https://avatars1.githubusercontent.com/u/7073616?v=4",
-			"profile": "https://github.com/Bourne-ID",
-			"contributions": [
-				"review",
-				"content",
-				"doc",
-				"infra",
-				"review"
-			]
-		},
-		{
-			"login": "cedarlug",
-			"name": "CedarLUG",
-			"avatar_url": "https://avatars2.githubusercontent.com/u/19336442?v=4",
-			"profile": "http://cedarlug.org",
-			"contributions": [
-				"bug",
-				"code",
-				"ideas",
-				"question",
-				"review"
-			]
-		},
-		{
-			"login": "UltimateByte",
-			"name": "UltimateByte",
-			"avatar_url": "https://avatars3.githubusercontent.com/u/8805941?v=4",
-			"profile": "https://www.terageek.org | https://www.haisoft.fr",
-			"contributions": [
-				"bug",
-				"code",
-				"doc",
-				"ideas",
-				"review"
-			]
-		}
-	],
-	"contributorsPerLine": 7,
-	"projectName": "LinuxGSM",
-	"projectOwner": "GameServerManagers",
-	"repoType": "github",
-	"repoHost": "https://github.com"
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "dgibbs64",
+      "name": "Daniel Gibbs",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/4478206?v=4",
+      "profile": "https://danielgibbs.co.uk",
+      "contributions": [
+        "bug",
+        "code",
+        "ideas",
+        "question",
+        "review",
+        "content",
+        "doc",
+        "infra"
+      ]
+    },
+    {
+      "login": "Frisasky",
+      "name": "Frisasky",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/26865851?v=4",
+      "profile": "https://github.com/Frisasky",
+      "contributions": [
+        "question",
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "kennyLtv",
+      "name": "Kenny Lindelof",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6133325?v=4",
+      "profile": "https://kennyl.design",
+      "contributions": [
+        "question"
+      ]
+    },
+    {
+      "login": "Scarsz",
+      "name": "Austin Shapiro",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7691988?v=4",
+      "profile": "https://scarsz.me",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "marvinlehmann",
+      "name": "Marvin Lehmann",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/4151266?v=4",
+      "profile": "https://github.com/marvinlehmann",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "Bourne-ID",
+      "name": "Bourne-ID",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7073616?v=4",
+      "profile": "https://github.com/Bourne-ID",
+      "contributions": [
+        "review",
+        "content",
+        "doc",
+        "infra",
+        "review"
+      ]
+    },
+    {
+      "login": "cedarlug",
+      "name": "CedarLUG",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/19336442?v=4",
+      "profile": "http://cedarlug.org",
+      "contributions": [
+        "bug",
+        "code",
+        "ideas",
+        "question",
+        "review"
+      ]
+    },
+    {
+      "login": "UltimateByte",
+      "name": "UltimateByte",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/8805941?v=4",
+      "profile": "https://www.terageek.org | https://www.haisoft.fr",
+      "contributions": [
+        "bug",
+        "code",
+        "doc",
+        "ideas",
+        "review"
+      ]
+    },
+    {
+      "login": "borzaka",
+      "name": "Attila",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1230402?v=4",
+      "profile": "https://github.com/borzaka",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "LinuxGSM",
+  "projectOwner": "GameServerManagers",
+  "repoType": "github",
+  "repoHost": "https://github.com"
 }
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ Fixes #[issue]
 * [ ] New feature (change which adds functionality).
 * [ ] New Server (new server added).
 * [ ] Refactor (restructures existing code).
-* [ ] Comment update (typo, spelling, etc).
+* [ ] Comment update (typo, spelling, explanation, examples, etc).
 * [ ] This change requires a documentation update.
 
 ## Checklist

diff --git a/README.md b/README.md
diff --git a/lgsm/config-default/config-lgsm/bsserver/_default.cfg b/lgsm/config-default/config-lgsm/bsserver/_default.cfg
@@ -114,7 +114,7 @@ engine="source"
 
 ## Server Specific Directories
 systemdir="${serverfiles}/berimbau"
-executabledir="${serverfiles}"
+executabledir="${serverfiles}/bin"
 executable="./srcds_run.sh"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"

diff --git a/lgsm/config-default/config-lgsm/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg
@@ -10,15 +10,15 @@
 
 ## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
 # https://developer.valvesoftware.com/wiki/Counter-Strike:_Global_Offensive_Dedicated_Servers#Starting_the_Server
-# [Game Modes]					gametype	gamemode	mapgroup (you can mix these across Game Modes, but use only one)
-# Arms Race						1			0			mg_armsrace
-# Classic Casual				0			0			mg_casualsigma, mg_casualdelta
-# Classic Competitive			0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
-# Custom						3			0
-# Deathmatch					1			2			mg_deathmatch
-# Demolition					1			1			mg_demolition
-# Wingman						0			2			
-# Danger Zone (FreeForAll)		6			0			mg_dz_blacksite
+# [Game Modes]			gametype	gamemode	mapgroup (you can mix these across all Game Modes except Danger Zone, but use only one)
+# Arms Race				1			0			mg_armsrace
+# Classic Casual		0			0			mg_casualsigma, mg_casualdelta
+# Classic Competitive	0			1			mg_active, mg_reserves, mg_hostage, mg_de_dust2
+# Custom				3			0
+# Deathmatch			1			2			mg_deathmatch
+# Demolition			1			1			mg_demolition
+# Wingman				0			2			
+# Danger Zone			6			0			mg_dz_blacksite (map: dz_blacksite), mg_dz_sirocco (map: dz_sirocco)
 gametype="0"
 gamemode="0"
 mapgroup="mg_active"

diff --git a/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg b/lgsm/config-default/config-lgsm/nmrihserver/_default.cfg
@@ -23,7 +23,7 @@ gslt=""
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-parms="-game nmrih -insecure -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
+parms="-game nmrih -strictportbind -ip ${ip} -port ${port} +clientport ${clientport} +tv_port ${sourcetvport} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers}"
 }
 
 #### LinuxGSM Settings ####

diff --git a/lgsm/config-default/config-lgsm/twserver/_default.cfg b/lgsm/config-default/config-lgsm/twserver/_default.cfg
@@ -17,7 +17,7 @@ ip="0.0.0.0"
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-parms="-f ${servercfgfullpath}"
+parms="-f ${servercfg}"
 }
 
 #### LinuxGSM Settings ####
@@ -108,7 +108,7 @@ executabledir="${systemdir}"
 executable="./teeworlds_srv"
 servercfg="${servicename}.cfg" # Teeworlds can also auto load any config if an autoexec.cfg file is present in the server dir
 servercfgdefault="server.cfg"
-servercfgdir="${serverfiles}"
+servercfgdir="${serverfiles}/tw"
 servercfgfullpath="${servercfgdir}/${servercfg}"
 
 ## Backup Directory