Merge branch 'master' into dev

README.md

@@ -66,7 +66,7 @@ docker run \
 ```
 with any additional options you desire (i.e. You'll have to expose more game ports in order to host more than one instance).
 
-When launching the container for the first time, you'll be prompted with the setup wizard.
+When launching the container for the first time, you'll be prompted with the setup wizard and then the container will exit. Start the container again to launch the server.
 
 Important note about port exposure: The internal port used by DreamDaemon _**MUST**_ match the port you want users to connect on. If it doesn't, you'll still be able to have them connect HOWEVER links from the BYOND hub will point at what DreamDaemon thinks the port is (the internal port).
 
@@ -76,6 +76,8 @@ The configuration option `General:ValidInstancePaths` will be preconfigured to p
 
 Note that this container is meant to be long running. Updates are handled internally as opposed to at the container level.
 
+Note that automatic configuration reloading is currently not supported in the container. See #1143
+
 If using manual configuration, before starting your container make sure the aforementioned `appsettings.Production.json` is setup properly. See below
 
 ### Configuring

build/Version.props

@@ -7,9 +7,9 @@
     <TgsConfigVersion>2.1.1</TgsConfigVersion>
     <TgsApiVersion>7.4.0</TgsApiVersion>
     <TgsClientVersion>8.4.0</TgsClientVersion>
-    <TgsDmapiVersion>5.2.7</TgsDmapiVersion>
+    <TgsDmapiVersion>5.2.8</TgsDmapiVersion>
     <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
-    <TgsContainerScriptVersion>1.1.0</TgsContainerScriptVersion>
+    <TgsContainerScriptVersion>1.1.1</TgsContainerScriptVersion>
   </PropertyGroup>
 </Project>
 

build/tgs.docker.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SCRIPT_VERSION="1.1.0"
+SCRIPT_VERSION="1.1.1"
 
 echo "tgstation-server 4 container startup script v$SCRIPT_VERSION"
 echo "PWD: $PWD"
@@ -9,7 +9,9 @@ PROD_CONFIG=/config_data/appsettings.Production.json
 HOST_CONFIG=/app/appsettings.Production.json
 
 if [ ! -f $PROD_CONFIG ]; then
-	echo "$PROD_CONFIG not detected! Creating empty..."
+	echo "$PROD_CONFIG not detected! Creating empty and running setup wizard..."
+	# Important, config reloading doesn't work with symlinks
+	export General__SetupWizardMode=Only
 	echo "{}" > $PROD_CONFIG
 fi
 

src/DMAPI/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.7"
+#define TGS_DMAPI_VERSION "5.2.8"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

src/DMAPI/tgs/includes.dm

@@ -14,4 +14,4 @@
 #include "v5\_defines.dm"
 #include "v5\api.dm"
 #include "v5\commands.dm"
-#include "v5\undef.dm"
+#include "v5\undefs.dm"

src/DMAPI/tgs/v5/README.md

@@ -0,0 +1,8 @@
+# DMAPI V4
+
+This DMAPI implements bridge requests using HTTP GET requests to TGS. It has no security restrictions.
+
+- [_defines.dm](./_defines.dm) contains constant definitions.
+- [api.dm](./api.dm) contains the bulk of the API code.
+- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s.
+- [undefs.dm](./undefs.dm) Undoes the work of `_defines.dm`.

src/Tgstation.Server.Host/apspsettings.Development.json

@@ -1,34 +0,0 @@
-{
-  "Database": {
-    "DatabaseType": "SqlServer",
-    "ResetAdminPassword": false,
-    "ConnectionString": "Data Source=(local);Initial Catalog=TGS_Debug2341;Integrated Security=True;Application Name=tgstation-server",
-    "DropDatabase": false,
-    "DesignTime": false,
-    "ServerVersion": null
-  },
-  "General": {
-    "ConfigVersion": "2.0.0",
-    "ApiPort": 5000,
-    "GitHubAccessToken": null,
-    "SetupWizardMode": "Never",
-    "ByondTopicTimeout": 5000,
-    "RestartTimeout": 60000,
-    "UseBasicWatchdog": false,
-    "MinimumPasswordLength": 15,
-    "InstanceLimit": 10,
-    "UserLimit": 100,
-    "ValidInstancePaths": null
-  },
-  "FileLogging": {
-    "Directory": null,
-    "Disable": false,
-    "LogLevel": "Trace",
-    "MicrosoftLogLevel": "Warning"
-  },
-  "ControlPanel": {
-    "Enable": true,
-    "AllowAnyOrigin": true,
-    "AllowedOrigins": null
-  }
-}

tgstation-server.sln

@@ -9,11 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.dockerignore = .dockerignore
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		.travis.yml = .travis.yml
-		appveyor.yml = appveyor.yml
 		LICENSE = LICENSE
 		omnisharp.json = omnisharp.json
 		README.md = README.md
+		SECURITY.md = SECURITY.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Host", "src\Tgstation.Server.Host\Tgstation.Server.Host.csproj", "{2B69AD6D-2B5A-4023-8EAD-0BD1B18E028A}"
@@ -27,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6
 		build\analyzers.ruleset = build\analyzers.ruleset
 		build\BuildDox.ps1 = build\BuildDox.ps1
 		build\ControlPanelVersion.props = build\ControlPanelVersion.props
+		build\coverlet.runsettings = build\coverlet.runsettings
 		build\Dockerfile = build\Dockerfile
 		build\GenerateMigrations.sh = build\GenerateMigrations.sh
 		build\OpenApiValidationSettings.json = build\OpenApiValidationSettings.json
@@ -34,7 +34,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6
 		build\tgs.docker.sh = build\tgs.docker.sh
 		build\tgs.ico = build\tgs.ico
 		build\tgs.png = build\tgs.png
-		build\UploadCoverage.ps1 = build\UploadCoverage.ps1
 		build\Version.props = build\Version.props
 	EndProjectSection
 EndProject
@@ -64,6 +63,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tgs", "tgs", "{F7765A4B-021C-454E-ABB1-2AB1B85F91B4}"
 	ProjectSection(SolutionItems) = preProject
 		src\DMAPI\tgs\includes.dm = src\DMAPI\tgs\includes.dm
+		src\DMAPI\tgs\LICENSE = src\DMAPI\tgs\LICENSE
+		src\DMAPI\tgs\README.md = src\DMAPI\tgs\README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{DCCBA9DA-47BA-4C70-823B-E99A3ACA0377}"
@@ -71,6 +72,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{DCCBA9DA-4
 		src\DMAPI\tgs\core\_definitions.dm = src\DMAPI\tgs\core\_definitions.dm
 		src\DMAPI\tgs\core\core.dm = src\DMAPI\tgs\core\core.dm
 		src\DMAPI\tgs\core\datum.dm = src\DMAPI\tgs\core\datum.dm
+		src\DMAPI\tgs\core\README.md = src\DMAPI\tgs\core\README.md
 		src\DMAPI\tgs\core\tgs_version.dm = src\DMAPI\tgs\core\tgs_version.dm
 	EndProjectSection
 EndProject
@@ -78,6 +80,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v3210", "v3210", "{1B228ACB
 	ProjectSection(SolutionItems) = preProject
 		src\DMAPI\tgs\v3210\api.dm = src\DMAPI\tgs\v3210\api.dm
 		src\DMAPI\tgs\v3210\commands.dm = src\DMAPI\tgs\v3210\commands.dm
+		src\DMAPI\tgs\v3210\README.md = src\DMAPI\tgs\v3210\README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3BB10856-AA01-43D1-AAB0-A013085426D6}"
@@ -91,12 +94,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v4", "v4", "{057FAC33-CC31-
 	ProjectSection(SolutionItems) = preProject
 		src\DMAPI\tgs\v4\api.dm = src\DMAPI\tgs\v4\api.dm
 		src\DMAPI\tgs\v4\commands.dm = src\DMAPI\tgs\v4\commands.dm
+		src\DMAPI\tgs\v4\README.md = src\DMAPI\tgs\v4\README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A55C1117-5808-4AB2-BEA6-4D4A3E66A2F2}"
-	ProjectSection(SolutionItems) = preProject
-		tools\TGS.postman_collection.json = tools\TGS.postman_collection.json
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DCC75431-7913-4306-9FAB-70998D440BCE}"
 	ProjectSection(SolutionItems) = preProject
@@ -133,7 +134,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v5", "v5", "{FAEAD3B5-2EAB-
 		src\DMAPI\tgs\v5\_defines.dm = src\DMAPI\tgs\v5\_defines.dm
 		src\DMAPI\tgs\v5\api.dm = src\DMAPI\tgs\v5\api.dm
 		src\DMAPI\tgs\v5\commands.dm = src\DMAPI\tgs\v5\commands.dm
-		src\DMAPI\tgs\v5\undef.dm = src\DMAPI\tgs\v5\undef.dm
+		src\DMAPI\tgs\v5\README.md = src\DMAPI\tgs\v5\README.md
+		src\DMAPI\tgs\v5\undefs.dm = src\DMAPI\tgs\v5\undefs.dm
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LongRunning", "LongRunning", "{EB1DDE8C-CA6F-4BE3-947B-597CA8EABEA5}"
@@ -163,6 +165,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildFail", "BuildFail", "{
 		tests\DMAPI\BuildFail\Test.dm = tests\DMAPI\BuildFail\Test.dm
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{28CDEB8F-2B2A-47A2-985B-5E2487E8D096}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\artifact-cleanup.yml = .github\workflows\artifact-cleanup.yml
+		.github\workflows\ci-suite.yml = .github\workflows\ci-suite.yml
+		.github\workflows\stable-merge.yml = .github\workflows\stable-merge.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{CFFD7992-E73A-4D1F-9D7A-C817C07B7BEB}"
+	ProjectSection(SolutionItems) = preProject
+		.github\ISSUE_TEMPLATE\bug-report.md = .github\ISSUE_TEMPLATE\bug-report.md
+		.github\ISSUE_TEMPLATE\feature_request.md = .github\ISSUE_TEMPLATE\feature_request.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -303,6 +318,8 @@ Global
 		{7B8FC2AF-1B64-4A89-8480-F0FE360DC9EC} = {82066812-6C73-4360-943B-B23F2F491261}
 		{F32B9514-AAD9-429D-841A-ED810FC2598C} = {82066812-6C73-4360-943B-B23F2F491261}
 		{103C61AB-67D6-46FE-AA47-CC633B88EE0F} = {82066812-6C73-4360-943B-B23F2F491261}
+		{28CDEB8F-2B2A-47A2-985B-5E2487E8D096} = {E82104F4-F5C4-4786-ACD4-B635166CDB21}
+		{CFFD7992-E73A-4D1F-9D7A-C817C07B7BEB} = {E82104F4-F5C4-4786-ACD4-B635166CDB21}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DFD36C95-3E49-41C7-ACDB-86BAF5B18A79}