ahri-cloud-projects/btcpayserver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

...

2 Commits
v1.0.2.71 ... v1.0.2.72

Author SHA1 Message Date
nicolas.dorier
c425e0439d Fix build error 2018-07-25 01:01:05 +09:00
nicolas.dorier
cdf78f0463 Fix mixing commands 2018-07-25 00:51:45 +09:00
2 changed files with 6 additions and 6 deletions

2
BTCPayServer/BTCPayServer.csproj

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<Version>1.0.2.71</Version>
<Version>1.0.2.72</Version>
<NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
</PropertyGroup>
<ItemGroup>

10
BTCPayServer/Controllers/ServerController.cs

@ -217,7 +217,7 @@ namespace BTCPayServer.Controllers
}
}
var error = RunSSH(vm, command, $"changedomain.sh {vm.DNSDomain}");
var error = RunSSH(vm, $"changedomain.sh {vm.DNSDomain}");
if (error != null)
return error;
@ -227,7 +227,7 @@ namespace BTCPayServer.Controllers
}
else if (command == "update")
{
var error = RunSSH(vm, command, $"btcpay-update.sh");
var error = RunSSH(vm, $"btcpay-update.sh");
if (error != null)
return error;
StatusMessage = $"The server might restart soon if an update is available...";
@ -250,9 +250,9 @@ namespace BTCPayServer.Controllers
return BadRequest();
}
private IActionResult RunSSH(MaintenanceViewModel vm, string command, string ssh)
private IActionResult RunSSH(MaintenanceViewModel vm, string ssh)
{
command = $"sudo bash -c '. /etc/profile.d/btcpay-env.sh && nohup {command} > /dev/null 2>&1 & disown'";
ssh = $"sudo bash -c '. /etc/profile.d/btcpay-env.sh && nohup {ssh} > /dev/null 2>&1 & disown'";
var sshClient = vm.CreateSSHClient(this.Request.Host.Host);
try
{
@ -282,7 +282,7 @@ namespace BTCPayServer.Controllers
{
try
{
Logs.PayServer.LogInformation("Running SSH command: " + command);
Logs.PayServer.LogInformation("Running SSH command: " + ssh);
var result = sshCommand.EndExecute(ar);
Logs.PayServer.LogInformation("SSH command executed: " + result);
}