greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modules: use user & group options

Browse Source 
I've tried my best to locate all uses of hardcoded usernames, but its
not guaranteed that all have been found/fixed.
This commit is contained in:
nixbitcoin 2021-02-16 16:52:45 +00:00
parent ccef870b74
commit e873326bfe
No known key found for this signature in database
GPG Key ID: DD11F9AD5308B3BA
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/bitcoind.nix
View File

@ -385,13 +385,13 @@ in {
users.groups.bitcoinrpc = {}; users.groups.bitcoinrpc = {};
nix-bitcoin.operator.groups = [ cfg.group ]; nix-bitcoin.operator.groups = [ cfg.group ];
nix-bitcoin.secrets.bitcoin-rpcpassword-privileged.user = "bitcoin"; nix-bitcoin.secrets.bitcoin-rpcpassword-privileged.user = cfg.user;
nix-bitcoin.secrets.bitcoin-rpcpassword-public = { nix-bitcoin.secrets.bitcoin-rpcpassword-public = {
user = "bitcoin"; user = cfg.user;
group = "bitcoinrpc"; group = "bitcoinrpc";
}; };
nix-bitcoin.secrets.bitcoin-HMAC-privileged.user = "bitcoin"; nix-bitcoin.secrets.bitcoin-HMAC-privileged.user = cfg.user;
nix-bitcoin.secrets.bitcoin-HMAC-public.user = "bitcoin"; nix-bitcoin.secrets.bitcoin-HMAC-public.user = cfg.user;
}; };
} }

8
modules/btcpayserver.nix
View File

@ -218,7 +218,7 @@ in {
users.groups.${cfg.nbxplorer.group} = {}; users.groups.${cfg.nbxplorer.group} = {};
users.users.${cfg.btcpayserver.user} = { users.users.${cfg.btcpayserver.user} = {
group = cfg.btcpayserver.group; group = cfg.btcpayserver.group;
extraGroups = [ "nbxplorer" ] extraGroups = [ cfg.nbxplorer.group ]
++ optional (cfg.btcpayserver.lightningBackend == "clightning") cfg.clightning.user; ++ optional (cfg.btcpayserver.lightningBackend == "clightning") cfg.clightning.user;
home = cfg.btcpayserver.dataDir; home = cfg.btcpayserver.dataDir;
}; };
@ -226,10 +226,10 @@ in {
nix-bitcoin.secrets = { nix-bitcoin.secrets = {
bitcoin-rpcpassword-btcpayserver = { bitcoin-rpcpassword-btcpayserver = {
user = "bitcoin"; user = cfg.bitcoind.user;
group = "nbxplorer"; group = cfg.nbxplorer.group;
}; };
bitcoin-HMAC-btcpayserver.user = "bitcoin"; bitcoin-HMAC-btcpayserver.user = cfg.bitcoind.user;
}; };
}; };
} }

2
modules/electrs.nix
View File

@ -110,7 +110,7 @@ in {
users.users.${cfg.user} = { users.users.${cfg.user} = {
group = cfg.group; group = cfg.group;
extraGroups = [ "bitcoinrpc" ] ++ optionals cfg.high-memory [ "bitcoin" ]; extraGroups = [ "bitcoinrpc" ] ++ optionals cfg.high-memory [ bitcoind.user ];
}; };
users.groups.${cfg.group} = {}; users.groups.${cfg.group} = {};
}; };

8
modules/lightning-loop.nix
View File

@ -89,7 +89,7 @@ in {
environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ]; environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' 0770 lnd lnd - -" "d '${cfg.dataDir}' 0770 ${config.services.lnd.user} ${config.services.lnd.group} - -"
]; ];
systemd.services.lightning-loop = { systemd.services.lightning-loop = {
@ -98,7 +98,7 @@ in {
after = [ "lnd.service" ]; after = [ "lnd.service" ];
serviceConfig = nbLib.defaultHardening // { serviceConfig = nbLib.defaultHardening // {
ExecStart = "${cfg.package}/bin/loopd --configfile=${configFile}"; ExecStart = "${cfg.package}/bin/loopd --configfile=${configFile}";
User = "lnd"; User = config.services.lnd.user;
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "10s"; RestartSec = "10s";
ReadWritePaths = cfg.dataDir; ReadWritePaths = cfg.dataDir;
@ -108,8 +108,8 @@ in {
}; };
nix-bitcoin.secrets = { nix-bitcoin.secrets = {
loop-key.user = "lnd"; loop-key.user = config.services.lnd.user;
loop-cert.user = "lnd"; loop-cert.user = config.services.lnd.user;
}; };
}; };
} }

2
modules/liquid.nix
View File

@ -252,6 +252,6 @@ in {
users.groups.${cfg.group} = {}; users.groups.${cfg.group} = {};
nix-bitcoin.operator.groups = [ cfg.group ]; nix-bitcoin.operator.groups = [ cfg.group ];
nix-bitcoin.secrets.liquid-rpcpassword.user = "liquid"; nix-bitcoin.secrets.liquid-rpcpassword.user = cfg.user;
}; };
} }

2
modules/lnd-rest-onion-service.nix
View File

@ -11,7 +11,7 @@ let
lnd = config.services.lnd; lnd = config.services.lnd;
bin = pkgs.writeScriptBin "lndconnect-rest-onion" '' bin = pkgs.writeScriptBin "lndconnect-rest-onion" ''
#!/usr/bin/env -S ${runAsUser} lnd ${pkgs.bash}/bin/bash #!/usr/bin/env -S ${runAsUser} ${lnd.user} ${pkgs.bash}/bin/bash
exec ${cfg.package}/bin/lndconnect \ exec ${cfg.package}/bin/lndconnect \
--host=$(cat ${config.nix-bitcoin.onionAddresses.dataDir}/lnd/lnd-rest) \ --host=$(cat ${config.nix-bitcoin.onionAddresses.dataDir}/lnd/lnd-rest) \

2
modules/recurring-donations.nix
View File

@ -100,7 +100,7 @@ in {
users.users.recurring-donations = { users.users.recurring-donations = {
group = "recurring-donations"; group = "recurring-donations";
extraGroups = [ "clightning" ]; extraGroups = [ config.services.clightning.group ];
}; };
users.groups.recurring-donations = {}; users.groups.recurring-donations = {};
}; };