diff options
author | 1000teslas <47207223+1000teslas@users.noreply.github.com> | 2021-12-10 00:42:46 +1100 |
---|---|---|
committer | 1000teslas <47207223+1000teslas@users.noreply.github.com> | 2021-12-10 00:56:21 +1100 |
commit | 9c478c19952a369b14f632d5920a104c9cff74b8 (patch) | |
tree | f54f50bb7c9f49185a45f36e094ee9970299daa3 | |
parent | 1161bf5d061819a9357ac1649c5360bfe4475995 (diff) | |
download | nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.tar nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.tar.gz nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.tar.bz2 nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.tar.lz nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.tar.xz nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.tar.zst nixpkgs-9c478c19952a369b14f632d5920a104c9cff74b8.zip |
nixos/xrdp: add confDir option
-rw-r--r-- | nixos/modules/services/networking/xrdp.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index c4f828f3c5a..afbcb989dae 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -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"; }; }; |