Merge pull request #414 from naturallaw777/copilot/fix-btcpay-startup-regression
Fix BTCPay Server startup crash: assign home directories to service users
This commit is contained in:
@@ -196,6 +196,7 @@ in {
|
|||||||
users.users.${cfg.nbxplorer.user} = {
|
users.users.${cfg.nbxplorer.user} = {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
group = cfg.nbxplorer.group;
|
group = cfg.nbxplorer.group;
|
||||||
|
home = cfg.nbxplorer.dataDir;
|
||||||
};
|
};
|
||||||
users.groups.${cfg.nbxplorer.group} = {};
|
users.groups.${cfg.nbxplorer.group} = {};
|
||||||
})
|
})
|
||||||
@@ -295,6 +296,7 @@ in {
|
|||||||
users.users.${cfg.btcpayserver.user} = {
|
users.users.${cfg.btcpayserver.user} = {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
group = cfg.btcpayserver.group;
|
group = cfg.btcpayserver.group;
|
||||||
|
home = cfg.btcpayserver.dataDir;
|
||||||
extraGroups = optional (cfg.btcpayserver.lightningBackend == "lnd") config.services.lnd.group;
|
extraGroups = optional (cfg.btcpayserver.lightningBackend == "lnd") config.services.lnd.group;
|
||||||
};
|
};
|
||||||
users.groups.${cfg.btcpayserver.group} = {};
|
users.groups.${cfg.btcpayserver.group} = {};
|
||||||
|
|||||||
@@ -57,6 +57,12 @@ let
|
|||||||
nbxplorerConfig = builtins.readFile nbxplorerConfigPath;
|
nbxplorerConfig = builtins.readFile nbxplorerConfigPath;
|
||||||
btcpayConfig = builtins.readFile btcpayConfigPath;
|
btcpayConfig = builtins.readFile btcpayConfigPath;
|
||||||
in
|
in
|
||||||
|
assert lib.assertMsg
|
||||||
|
(config.users.users.${config.services.btcpayserver.user}.home == config.services.btcpayserver.dataDir)
|
||||||
|
"btcpayserver user home must match btcpayserver dataDir";
|
||||||
|
assert lib.assertMsg
|
||||||
|
(config.users.users.${config.services.nbxplorer.user}.home == config.services.nbxplorer.dataDir)
|
||||||
|
"nbxplorer user home must match nbxplorer dataDir";
|
||||||
assert lib.assertMsg
|
assert lib.assertMsg
|
||||||
(config.nix-bitcoin.secrets.bitcoin-HMAC-btcpayserver.user == config.services.bitcoind.user)
|
(config.nix-bitcoin.secrets.bitcoin-HMAC-btcpayserver.user == config.services.bitcoind.user)
|
||||||
"bitcoin-HMAC-btcpayserver must be owned by bitcoind";
|
"bitcoin-HMAC-btcpayserver must be owned by bitcoind";
|
||||||
|
|||||||
Reference in New Issue
Block a user