mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
nixos/xrdp: add confDir option
This commit is contained in:
parent
1161bf5d06
commit
9c478c1995
@ -97,6 +97,11 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
confDir = mkOption {
|
||||
type = types.package;
|
||||
default = confDir;
|
||||
description = "The location of the config files for xrdp.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -149,7 +154,7 @@ in
|
||||
User = "xrdp";
|
||||
Group = "xrdp";
|
||||
PermissionsStartOnly = true;
|
||||
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";
|
||||
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${cfg.confDir}/xrdp.ini";
|
||||
};
|
||||
};
|
||||
|
||||
@ -159,7 +164,7 @@ in
|
||||
description = "xrdp session manager";
|
||||
restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
|
||||
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${cfg.confDir}/sesman.ini";
|
||||
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
|
||||
};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user