Skip to content

Commit b70f485

Browse files
authoredMar 23, 2025
Revert "nixos/xrdp: use --replace-fail with substituteInPlace" (#392479)
2 parents be7ff13 + d9e165e commit b70f485

File tree

1 file changed

+9
-9
lines changed
  • nixos/modules/services/networking

1 file changed

+9
-9
lines changed
 

‎nixos/modules/services/networking/xrdp.nix

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ let
2020
chmod +x $out/startwm.sh
2121
2222
substituteInPlace $out/xrdp.ini \
23-
--replace-fail "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \
24-
--replace-fail "certificate=" "certificate=${cfg.sslCert}" \
25-
--replace-fail "key_file=" "key_file=${cfg.sslKey}" \
26-
--replace-fail LogFile=xrdp.log LogFile=/dev/null \
27-
--replace-fail EnableSyslog=true EnableSyslog=false
23+
--replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \
24+
--replace "certificate=" "certificate=${cfg.sslCert}" \
25+
--replace "key_file=" "key_file=${cfg.sslKey}" \
26+
--replace LogFile=xrdp.log LogFile=/dev/null \
27+
--replace EnableSyslog=true EnableSyslog=false
2828
2929
substituteInPlace $out/sesman.ini \
30-
--replace-fail LogFile=xrdp-sesman.log LogFile=/dev/null \
31-
--replace-fail EnableSyslog=1 EnableSyslog=0 \
32-
--replace-fail startwm.sh $out/startwm.sh \
33-
--replace-fail reconnectwm.sh $out/reconnectwm.sh \
30+
--replace LogFile=xrdp-sesman.log LogFile=/dev/null \
31+
--replace EnableSyslog=1 EnableSyslog=0 \
32+
--replace startwm.sh $out/startwm.sh \
33+
--replace reconnectwm.sh $out/reconnectwm.sh \
3434
3535
# Ensure that clipboard works for non-ASCII characters
3636
sed -i -e '/.*SessionVariables.*/ a\

0 commit comments

Comments
 (0)
Failed to load comments.