Skip to content

nixos/xrdp: use --replace-fail with substituteInPlace, try #2 #392512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 1 commit into from
Jul 1, 2025
Merged

nixos/xrdp: use --replace-fail with substituteInPlace, try #2 #392512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions nixos/modules/services/networking/xrdp.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ let
chmod +x $out/startwm.sh

substituteInPlace $out/xrdp.ini \
--replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \
--replace "certificate=" "certificate=${cfg.sslCert}" \
--replace "key_file=" "key_file=${cfg.sslKey}" \
--replace LogFile=xrdp.log LogFile=/dev/null \
--replace EnableSyslog=true EnableSyslog=false
--replace-fail "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \
--replace-fail "certificate=" "certificate=${cfg.sslCert}" \
--replace-fail "key_file=" "key_file=${cfg.sslKey}" \
--replace-fail LogFile=xrdp.log LogFile=/dev/null \
--replace-fail EnableSyslog=true EnableSyslog=false

substituteInPlace $out/sesman.ini \
--replace LogFile=xrdp-sesman.log LogFile=/dev/null \
--replace EnableSyslog=1 EnableSyslog=0 \
--replace startwm.sh $out/startwm.sh \
--replace reconnectwm.sh $out/reconnectwm.sh \
--replace-fail LogFile=xrdp-sesman.log LogFile=/dev/null \
--replace-fail EnableSyslog=true EnableSyslog=false \
--replace-fail startwm.sh $out/startwm.sh \
--replace-fail reconnectwm.sh $out/reconnectwm.sh \

# Ensure that clipboard works for non-ASCII characters
sed -i -e '/.*SessionVariables.*/ a\
Expand Down Expand Up @@ -122,8 +122,8 @@ in
'';
example = ''
substituteInPlace $out/sesman.ini \
--replace LogLevel=INFO LogLevel=DEBUG \
--replace LogFile=/dev/null LogFile=/var/log/xrdp.log
--replace-fail LogLevel=INFO LogLevel=DEBUG \
--replace-fail LogFile=/dev/null LogFile=/var/log/xrdp.log
'';
};
};
Expand Down