cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-31 00:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1274 from tgstation/FixDefaultConfigNonsense [TGSDeploy]

Browse Source 
Fix default config nonsense
This commit is contained in:
Jordan Brown
2021-06-07 22:13:40 -04:00
committed by GitHub
parent fbfef6c0aa 644aede760
commit 30fe1f82b5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-suite.yml
+3
View File
@@ -257,6 +257,7 @@ jobs:
dotnet publish -c ${{ matrix.configuration }} -o ../../Artifacts/Service
cd ../Tgstation.Server.Host
dotnet publish -c ${{ matrix.configuration }} --no-build -o ../../Artifacts/Service/lib/Default
mv ../../Artifacts/Service/lib/Default/appsettings.yml ../../Artifacts/Service/appsettings.yml
- name: Store Server Service
if: ${{ matrix.configuration == 'Release' && matrix.watchdog-type == 'Basic' }}
@@ -396,12 +397,14 @@ jobs:
dotnet publish -c ${{ matrix.configuration }} -o ../../Artifacts/Console
cd ../Tgstation.Server.Host
dotnet publish -c ${{ matrix.configuration }}NoService --no-build -o ../../Artifacts/Console/lib/Default
mv ../../Artifacts/Console/lib/Default/appsettings.yml ../../Artifacts/Console/appsettings.yml
- name: Package Server Update Package
if: ${{ matrix.configuration == 'Release' && matrix.watchdog-type == 'System' && matrix.database-type == 'PostgresSql' }}
run: |
cd src/Tgstation.Server.Host
dotnet publish -c ${{ matrix.configuration }}NoService --no-build -o ../../Artifacts/ServerUpdate
rm ../../Artifacts/ServerUpdate/appsettings.yml
- name: Store Server Console
if: ${{ matrix.configuration == 'Release' && matrix.watchdog-type == 'System' && matrix.database-type == 'MariaDB' }}
src/Tgstation.Server.Host/Controllers/ControlPanelController.cs
+7 -5
View File
@@ -58,11 +58,13 @@ namespace Tgstation.Server.Host.Controllers
var controlPanelChannel = controlPanelConfiguration.Channel;
if (controlPanelChannel == "local")
controlPanelChannel = ControlPanelRoute;
controlPanelChannel = controlPanelChannel
.Replace("${Major}", ApiHeaders.Version.Major.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal)
.Replace("${Minor}", ApiHeaders.Version.Minor.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal)
.Replace("${Patch}", ApiHeaders.Version.Build.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal);
else if (String.IsNullOrWhiteSpace(controlPanelChannel))
controlPanelChannel = null;
else
controlPanelChannel = controlPanelChannel
.Replace("${Major}", ApiHeaders.Version.Major.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal)
.Replace("${Minor}", ApiHeaders.Version.Minor.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal)
.Replace("${Patch}", ApiHeaders.Version.Build.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal);
return Json(new
{