Merge changes

This commit is contained in:
Kayomani
2015-07-20 22:09:07 +01:00
35 changed files with 335 additions and 194 deletions

View File

@@ -19,14 +19,23 @@ namespace Jackett.Models.Config
public string APIKey { get; set; }
public string AdminPassword { get; set; }
public string GetListenAddress(bool? external = null)
public string[] GetListenAddresses(bool? external = null)
{
if (external == null)
{
external = AllowExternal;
}
return "http://" + (external.Value ? "*" : "localhost") + ":" + Port + "/";
if (external.Value)
{
return new string[] { "http://*:" + Port + "/" };
}
else
{
return new string[] {
"http://127.0.0.1:" + Port + "/",
"http://localhost:" + Port + "/",
};
}
}
public string GenerateApi()