public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not create non-deterministic file (rsakeys.ini) in nixstore

Browse Source
This commit is contained in:
Volth 2017-04-29 17:23:21 +00:00
parent 965d0dab78
commit 5e8ad49de8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,16 +9,15 @@ let
cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out cp ${cfg.package}/etc/xrdp/{km-*,xrdp,sesman,xrdp_keyboard}.ini $out
${cfg.package}/bin/xrdp-keygen xrdp $out/rsakeys.ini
cat > $out/startwm.sh <<EOF cat > $out/startwm.sh <<EOF
#!/bin/sh #!/bin/sh
. /etc/profile . /etc/profile
${cfg.defaultWindowManager} ${cfg.defaultWindowManager}
EOF EOF
chmod +x $out/startwm.sh chmod +x $out/startwm.sh
substituteInPlace $out/xrdp.ini \ substituteInPlace $out/xrdp.ini \
--replace "#rsakeys_ini=" "rsakeys_ini=/var/run/xrdp/rsakeys.ini" \
--replace "certificate=" "certificate=${cfg.sslCert}" \ --replace "certificate=" "certificate=${cfg.sslCert}" \
--replace "key_file=" "key_file=${cfg.sslKey}" \ --replace "key_file=" "key_file=${cfg.sslKey}" \
--replace LogFile=xrdp.log LogFile=/dev/null \ --replace LogFile=xrdp.log LogFile=/dev/null \
@ -117,6 +116,10 @@ in
chown root:xrdp ${cfg.sslKey} ${cfg.sslCert} chown root:xrdp ${cfg.sslKey} ${cfg.sslCert}
chmod 440 ${cfg.sslKey} ${cfg.sslCert} chmod 440 ${cfg.sslKey} ${cfg.sslCert}
fi fi
if [ ! -s /var/run/xrdp/rsakeys.ini ]; then
mkdir -p /var/run/xrdp
${cfg.package}/bin/xrdp-keygen xrdp /var/run/xrdp/rsakeys.ini
fi
''; '';
serviceConfig = { serviceConfig = {
User = "xrdp"; User = "xrdp";