Configure URLs on Linux, but don't register them

This commit is contained in:
Mark McDowall 2014-01-02 19:25:30 -08:00
parent b5c9a811dd
commit b16360fd39
2 changed files with 8 additions and 5 deletions

View File

@ -43,7 +43,7 @@ namespace NzbDrone.Host.AccessControl
var localHttpsUrls = BuildUrls("https", "localhost", _configFileProvider.SslPort); var localHttpsUrls = BuildUrls("https", "localhost", _configFileProvider.SslPort);
var wildcardHttpsUrls = BuildUrls("https", "*", _configFileProvider.SslPort); var wildcardHttpsUrls = BuildUrls("https", "*", _configFileProvider.SslPort);
if (!_runtimeInfo.IsAdmin) if (OsInfo.IsWindows && !_runtimeInfo.IsAdmin)
{ {
var httpUrls = wildcardHttpUrls.All(IsRegistered) ? wildcardHttpUrls : localHttpUrls; var httpUrls = wildcardHttpUrls.All(IsRegistered) ? wildcardHttpUrls : localHttpUrls;
var httpsUrls = wildcardHttpsUrls.All(IsRegistered) ? wildcardHttpsUrls : localHttpsUrls; var httpsUrls = wildcardHttpsUrls.All(IsRegistered) ? wildcardHttpsUrls : localHttpsUrls;
@ -57,9 +57,12 @@ namespace NzbDrone.Host.AccessControl
Urls.AddRange(wildcardHttpUrls); Urls.AddRange(wildcardHttpUrls);
Urls.AddRange(wildcardHttpsUrls); Urls.AddRange(wildcardHttpsUrls);
if (OsInfo.IsWindows)
{
RefreshRegistration(); RefreshRegistration();
} }
} }
}
private void RefreshRegistration() private void RefreshRegistration()
{ {

View File

@ -53,9 +53,9 @@ namespace NzbDrone.Host.Owin
_firewallAdapter.MakeAccessible(); _firewallAdapter.MakeAccessible();
_sslAdapter.Register(); _sslAdapter.Register();
} }
}
_urlAclAdapter.ConfigureUrl(); _urlAclAdapter.ConfigureUrl();
}
var options = new StartOptions() var options = new StartOptions()
{ {