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