Remove dcrwallet operator feature
This commit is contained in:
+2
-45
@@ -43,19 +43,9 @@ in
|
||||
description = "Additional packages to add to the dcrwallet user's environment";
|
||||
};
|
||||
|
||||
operator = {
|
||||
enable = mkEnableOption "Install dcrwallet CLI packages for an operator user";
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "operator";
|
||||
description = "Operator username to receive dcrwallet package(s) in their environment.";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
users.users.${cfg.user} = {
|
||||
group = cfg.group;
|
||||
home = cfg.dataDir;
|
||||
@@ -86,38 +76,5 @@ in
|
||||
};
|
||||
restartTriggers = [ cfg.configFile ];
|
||||
};
|
||||
}
|
||||
(lib.mkIf cfg.operator.enable {
|
||||
users.users.${cfg.operator.name} = {
|
||||
packages = [ cfg.package ] ++ cfg.extraPackages;
|
||||
# Add the operator user to the dcrwallet group and dcrd group
|
||||
extraGroups = [ cfg.group ] ++ lib.optional (dcrdEnabled && config.services.dcrd.group != cfg.group) config.services.dcrd.group;
|
||||
};
|
||||
|
||||
# Ensure operator (a member of cfg.group) can read rpc.cert which dcrwallet
|
||||
# writes with mode 0600 by default. We watch for the file and set g+r.
|
||||
systemd.services.dcrwallet-cert-perms = {
|
||||
description = "Ensure group-read on dcrwallet rpc.cert";
|
||||
after = [ "dcrwallet.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
};
|
||||
script = ''
|
||||
if [ -e ${cfg.dataDir}/rpc.cert ]; then
|
||||
${pkgs.coreutils}/bin/chmod g+r ${cfg.dataDir}/rpc.cert
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.paths.dcrwallet-cert-perms = {
|
||||
description = "Watch dcrwallet rpc.cert to fix permissions";
|
||||
pathConfig = {
|
||||
# PathModified = "${cfg.dataDir}/rpc.cert";
|
||||
PathChanged = "${cfg.dataDir}/rpc.cert";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
})
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user