Merge pull request #149860 from 1000teslas/xrdp-conf

nixos/xrdp: add confDir option

authored by Ryan Mulligan and committed by GitHub c84ba61d 269390af

+7 -2
+7 -2
nixos/modules/services/networking/xrdp.nix
··· 97 ''; 98 }; 99 100 }; 101 }; 102 ··· 149 User = "xrdp"; 150 Group = "xrdp"; 151 PermissionsStartOnly = true; 152 - ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini"; 153 }; 154 }; 155 ··· 159 description = "xrdp session manager"; 160 restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children 161 serviceConfig = { 162 - ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini"; 163 ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; 164 }; 165 };
··· 97 ''; 98 }; 99 100 + confDir = mkOption { 101 + type = types.path; 102 + default = confDir; 103 + description = "The location of the config files for xrdp."; 104 + }; 105 }; 106 }; 107 ··· 154 User = "xrdp"; 155 Group = "xrdp"; 156 PermissionsStartOnly = true; 157 + ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${cfg.confDir}/xrdp.ini"; 158 }; 159 }; 160 ··· 164 description = "xrdp session manager"; 165 restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children 166 serviceConfig = { 167 + ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${cfg.confDir}/sesman.ini"; 168 ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; 169 }; 170 };