diff --git a/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs index 115ec4f041..fddff557ba 100644 --- a/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs @@ -64,7 +64,7 @@ namespace Tgstation.Server.Host.Components.Engine /// /// The for the . /// - readonly GeneralConfiguration generalConfiguration; + protected GeneralConfiguration GeneralConfiguration { get; } /// /// Initializes a new instance of the class. @@ -74,7 +74,7 @@ namespace Tgstation.Server.Host.Components.Engine /// The value of . /// The value of . /// The value of . - /// The containing value of . + /// The containing value of . public OpenDreamInstaller( IIOManager ioManager, ILogger logger, @@ -87,7 +87,7 @@ namespace Tgstation.Server.Host.Components.Engine this.platformIdentifier = platformIdentifier ?? throw new ArgumentNullException(nameof(platformIdentifier)); ProcessExecutor = processExecutor ?? throw new ArgumentNullException(nameof(processExecutor)); this.repositoryManager = repositoryManager ?? throw new ArgumentNullException(nameof(repositoryManager)); - generalConfiguration = generalConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(generalConfigurationOptions)); + GeneralConfiguration = generalConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(generalConfigurationOptions)); } /// @@ -116,7 +116,7 @@ namespace Tgstation.Server.Host.Components.Engine var progressSection1 = jobProgressReporter?.CreateSection("Updating OpenDream git repository", 0.5f); var repo = await repositoryManager.CloneRepository( - generalConfiguration.OpenDreamGitUrl, + GeneralConfiguration.OpenDreamGitUrl, null, null, null, @@ -142,7 +142,7 @@ namespace Tgstation.Server.Host.Components.Engine var progressSection2 = jobProgressReporter?.CreateSection("Checking out OpenDream version", 0.5f); var committish = version.SourceSHA - ?? $"{generalConfiguration.OpenDreamGitTagPrefix}{version.Version.Semver()}"; + ?? $"{GeneralConfiguration.OpenDreamGitTagPrefix}{version.Version.Semver()}"; await repo.CheckoutObject( committish, diff --git a/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs index eb31f462fa..71c35eb765 100644 --- a/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs +++ b/src/Tgstation.Server.Host/Components/Engine/WindowsOpenDreamInstaller.cs @@ -91,6 +91,9 @@ namespace Tgstation.Server.Host.Components.Engine /// A representing the running operation. async ValueTask AddServerFirewallException(EngineVersion version, string path, CancellationToken cancellationToken) { + if (GeneralConfiguration.SkipAddingByondFirewallException) + return; + GetExecutablePaths(path, out var serverExePath, out _); int exitCode; diff --git a/src/Tgstation.Server.Host/appsettings.yml b/src/Tgstation.Server.Host/appsettings.yml index 3046339495..82cb960bf3 100644 --- a/src/Tgstation.Server.Host/appsettings.yml +++ b/src/Tgstation.Server.Host/appsettings.yml @@ -14,7 +14,7 @@ General: InstanceLimit: 10 # Maximum number of allowed instances ValidInstancePaths: # An array of directories instances may be created in (either directly or as a subdirectory). null removes the restriction HostApiDocumentation: false # Make HTTP API documentation available at /swagger/v1/swagger.json - SkipAddingByondFirewallException: false # Windows Only: Prevent running netsh.exe to add a firewall exception for installed DreamDaemon binaries + SkipAddingByondFirewallException: false # Windows Only: Prevent running netsh.exe to add a firewall exception for installed engine binaries DeploymentDirectoryCopyTasksPerCore: 100 # Maximum number of concurrent file copy operations PER available CPU core OpenDreamGitUrl: https://github.com/OpenDreamProject/OpenDream # The repository to retrieve OpenDream from OpenDreamGitTagPrefix: v # The prefix to the OpenDream semver as tags appear in the git repository