mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-03 17:36:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Deducing if to perform update check from update url configuration

Browse source
This commit is contained in:
rockstardev 2020-08-03 03:16:29 -05:00
parent ce87d2e45c
commit 16eedf4153
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BTCPayServer/Configuration/BTCPayServerOptions.cs
View file

@ -176,8 +176,7 @@ namespace BTCPayServer.Configuration
SocksEndpoint = endpoint; SocksEndpoint = endpoint;
} }
UpdateCheck = conf.GetOrDefault<bool>("updatecheck", false); UpdateUrl = conf.GetOrDefault<Uri>("updateurl", null);
UpdateUrl = conf.GetOrDefault<Uri>("updateurl", new Uri("https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest"));
var sshSettings = ParseSSHConfiguration(conf); var sshSettings = ParseSSHConfiguration(conf);
if ((!string.IsNullOrEmpty(sshSettings.Password) || !string.IsNullOrEmpty(sshSettings.KeyFile)) && !string.IsNullOrEmpty(sshSettings.Server)) if ((!string.IsNullOrEmpty(sshSettings.Password) || !string.IsNullOrEmpty(sshSettings.KeyFile)) && !string.IsNullOrEmpty(sshSettings.Server))
@ -303,7 +302,6 @@ namespace BTCPayServer.Configuration
set; set;
} }
public string TorrcFile { get; set; } public string TorrcFile { get; set; }
public bool UpdateCheck { get; set; }
public Uri UpdateUrl { get; set; } public Uri UpdateUrl { get; set; }
} }
} }

3
BTCPayServer/Configuration/DefaultConfiguration.cs
View file

@ -38,8 +38,7 @@ namespace BTCPayServer.Configuration
app.Option("--sshtrustedfingerprints", "SSH Host public key fingerprint or sha256 (default: empty, it will allow untrusted connections)", CommandOptionType.SingleValue); app.Option("--sshtrustedfingerprints", "SSH Host public key fingerprint or sha256 (default: empty, it will allow untrusted connections)", CommandOptionType.SingleValue);
app.Option("--torrcfile", "Path to torrc file containing hidden services directories (default: empty)", CommandOptionType.SingleValue); app.Option("--torrcfile", "Path to torrc file containing hidden services directories (default: empty)", CommandOptionType.SingleValue);
app.Option("--socksendpoint", "Socks endpoint to connect to onion urls (default: empty)", CommandOptionType.SingleValue); app.Option("--socksendpoint", "Socks endpoint to connect to onion urls (default: empty)", CommandOptionType.SingleValue);
app.Option("--updatecheck", $"Enabling once a day check for new releases (default: false)", CommandOptionType.SingleValue); app.Option("--updateurl", $"Url used for once a day new release version check. Check performed only if value is not empty (default: empty)", CommandOptionType.SingleValue);
app.Option("--updateurl", $"Url location used for updatecheck (default: https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest)", CommandOptionType.SingleValue);
app.Option("--debuglog", "A rolling log file for debug messages.", CommandOptionType.SingleValue); app.Option("--debuglog", "A rolling log file for debug messages.", CommandOptionType.SingleValue);
app.Option("--debugloglevel", "The severity you log (default:information)", CommandOptionType.SingleValue); app.Option("--debugloglevel", "The severity you log (default:information)", CommandOptionType.SingleValue);
app.Option("--disable-registration", "Disables new user registrations (default:true)", CommandOptionType.SingleValue); app.Option("--disable-registration", "Disables new user registrations (default:true)", CommandOptionType.SingleValue);

2
BTCPayServer/Controllers/AccountController.cs
View file

@ -444,7 +444,7 @@ namespace BTCPayServer.Controllers
settings.FirstRun = false; settings.FirstRun = false;
await _SettingsRepository.UpdateSetting<ThemeSettings>(settings); await _SettingsRepository.UpdateSetting<ThemeSettings>(settings);
await _SettingsRepository.FirstAdminRegistered(policies, _Options.UpdateCheck, _Options.DisableRegistration); await _SettingsRepository.FirstAdminRegistered(policies, _Options.UpdateUrl != null, _Options.DisableRegistration);
RegisteredAdmin = true; RegisteredAdmin = true;
} }

2
BTCPayServer/Controllers/GreenField/UsersController.cs
View file

@ -148,7 +148,7 @@ namespace BTCPayServer.Controllers.GreenField
await _userManager.AddToRoleAsync(user, Roles.ServerAdmin); await _userManager.AddToRoleAsync(user, Roles.ServerAdmin);
if (!anyAdmin) if (!anyAdmin)
{ {
await _settingsRepository.FirstAdminRegistered(policies, _options.UpdateCheck, _options.DisableRegistration); await _settingsRepository.FirstAdminRegistered(policies, _options.UpdateUrl != null, _options.DisableRegistration);
} }
} }
_eventAggregator.Publish(new UserRegisteredEvent() { RequestUri = Request.GetAbsoluteRootUri(), User = user, Admin = request.IsAdministrator is true }); _eventAggregator.Publish(new UserRegisteredEvent() { RequestUri = Request.GetAbsoluteRootUri(), User = user, Admin = request.IsAdministrator is true });

3
BTCPayServer/HostedServices/NewVersionCheckerHostedService.cs
View file

@ -94,6 +94,9 @@ namespace BTCPayServer.HostedServices
private static readonly Regex _releaseVersionTag = new Regex("^(v[1-9]+(\\.[0-9]+)*(-[0-9]+)?)$"); private static readonly Regex _releaseVersionTag = new Regex("^(v[1-9]+(\\.[0-9]+)*(-[0-9]+)?)$");
public async Task<string> Fetch(CancellationToken cancellation) public async Task<string> Fetch(CancellationToken cancellation)
{ {
if (_updateurl == null)
return null;
using (var resp = await _httpClient.GetAsync(_updateurl, cancellation)) using (var resp = await _httpClient.GetAsync(_updateurl, cancellation))
{ {
var strResp = await resp.Content.ReadAsStringAsync(); var strResp = await resp.Content.ReadAsStringAsync();

1
BTCPayServer/Properties/launchSettings.json
View file

@ -20,7 +20,6 @@
"BTCPAY_DEBUGLOG": "debug.log", "BTCPAY_DEBUGLOG": "debug.log",
"BTCPAY_TORRCFILE": "../BTCPayServer.Tests/TestData/Tor/torrc", "BTCPAY_TORRCFILE": "../BTCPayServer.Tests/TestData/Tor/torrc",
"BTCPAY_SOCKSENDPOINT": "localhost:9050", "BTCPAY_SOCKSENDPOINT": "localhost:9050",
"BTCPAY_UPDATECHECK": "false",
"BTCPAY_UPDATEURL": "" "BTCPAY_UPDATEURL": ""
}, },
"applicationUrl": "http://127.0.0.1:14142/" "applicationUrl": "http://127.0.0.1:14142/"