talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Sandro 2025-07-01 11:59:37 +02:00 committed by GitHub
commit ace047b8d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/services/networking/xrdp.nix
View File

@ -25,17 +25,17 @@ let
chmod +x $out/startwm.sh chmod +x $out/startwm.sh
substituteInPlace $out/xrdp.ini \ substituteInPlace $out/xrdp.ini \
--replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \ --replace-fail "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \
--replace "certificate=" "certificate=${cfg.sslCert}" \ --replace-fail "certificate=" "certificate=${cfg.sslCert}" \
--replace "key_file=" "key_file=${cfg.sslKey}" \ --replace-fail "key_file=" "key_file=${cfg.sslKey}" \
--replace LogFile=xrdp.log LogFile=/dev/null \ --replace-fail LogFile=xrdp.log LogFile=/dev/null \
--replace EnableSyslog=true EnableSyslog=false --replace-fail EnableSyslog=true EnableSyslog=false
substituteInPlace $out/sesman.ini \ substituteInPlace $out/sesman.ini \
--replace LogFile=xrdp-sesman.log LogFile=/dev/null \ --replace-fail LogFile=xrdp-sesman.log LogFile=/dev/null \
--replace EnableSyslog=1 EnableSyslog=0 \ --replace-fail EnableSyslog=true EnableSyslog=false \
--replace startwm.sh $out/startwm.sh \ --replace-fail startwm.sh $out/startwm.sh \
--replace reconnectwm.sh $out/reconnectwm.sh \ --replace-fail reconnectwm.sh $out/reconnectwm.sh \
# Ensure that clipboard works for non-ASCII characters # Ensure that clipboard works for non-ASCII characters
sed -i -e '/.*SessionVariables.*/ a\ sed -i -e '/.*SessionVariables.*/ a\
@ -127,8 +127,8 @@ in
''; '';
example = '' example = ''
substituteInPlace $out/sesman.ini \ substituteInPlace $out/sesman.ini \
--replace LogLevel=INFO LogLevel=DEBUG \ --replace-fail LogLevel=INFO LogLevel=DEBUG \
--replace LogFile=/dev/null LogFile=/var/log/xrdp.log --replace-fail LogFile=/dev/null LogFile=/var/log/xrdp.log
''; '';
}; };
}; };