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

nixos/xrdp: /var/run -> /run

Browse Source
This commit is contained in:
Bob van der Linden 2018-12-19 22:41:17 +01:00
parent 210b7134d3
commit 323e8ef375
No known key found for this signature in database
GPG Key ID: 2A90361F99CF1795
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ let
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 "#rsakeys_ini=" "rsakeys_ini=/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 \
@ -132,9 +132,9 @@ 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 if [ ! -s /run/xrdp/rsakeys.ini ]; then
mkdir -p /var/run/xrdp mkdir -p /run/xrdp
${cfg.package}/bin/xrdp-keygen xrdp /var/run/xrdp/rsakeys.ini ${cfg.package}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini
fi fi
''; '';
serviceConfig = { serviceConfig = {