aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-20 13:44:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix config discovery when datadir is set

Browse Source
This commit is contained in:
nicolas.dorier
2018-01-12 13:45:25 +09:00
parent bf871c46ec
commit ef165e15bf
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/docker-compose.yml
View File

@@ -37,7 +37,7 @@ services:
- postgres
nbxplorer:
image: nicolasdorier/nbxplorer:1.0.0.52
image: nicolasdorier/nbxplorer:1.0.0.53
ports:
- "32838:32838"
expose:

2
BTCPayServer/BTCPayServer.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Version>1.0.0.67</Version>
<Version>1.0.0.68</Version>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Build\dockerfiles\**" />

10
BTCPayServer/Configuration/DefaultConfiguration.cs
View File

@@ -55,7 +55,15 @@ namespace BTCPayServer.Configuration
if (dataDir == null)
return network.DefaultConfigurationFile;
var fileName = Path.GetFileName(network.DefaultConfigurationFile);
return Path.Combine(dataDir, fileName);
var chainDir = Path.GetFileName(Path.GetDirectoryName(network.DefaultConfigurationFile));
chainDir = Path.Combine(dataDir, chainDir);
try
{
if (!Directory.Exists(chainDir))
Directory.CreateDirectory(chainDir);
}
catch { }
return Path.Combine(chainDir, fileName);
}
public static ChainType GetChainType(IConfiguration conf)