summary refs log tree commit diff
diff options
context:
space:
mode:
authorBob van der Linden <bobvanderlinden@gmail.com>2018-12-19 22:41:17 +0100
committerBob van der Linden <bobvanderlinden@gmail.com>2019-03-24 21:15:29 +0100
commit323e8ef37549c2cff1412c384858fc6e78d64c1c (patch)
tree577caadcab293ea9b1ab2bdf988a3097b3cf48f2
parent210b7134d3552a07316ce169d08a9c24ba461c31 (diff)
downloadnixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.tar
nixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.tar.gz
nixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.tar.bz2
nixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.tar.lz
nixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.tar.xz
nixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.tar.zst
nixpkgs-323e8ef37549c2cff1412c384858fc6e78d64c1c.zip
nixos/xrdp: /var/run -> /run
-rw-r--r--nixos/modules/services/networking/xrdp.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index cc18f6d0064..b7dd1c5d99d 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -17,7 +17,7 @@ let
     chmod +x $out/startwm.sh
 
     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 "key_file=" "key_file=${cfg.sslKey}" \
       --replace LogFile=xrdp.log LogFile=/dev/null \
@@ -132,9 +132,9 @@ in
             chown root:xrdp ${cfg.sslKey} ${cfg.sslCert}
             chmod 440 ${cfg.sslKey} ${cfg.sslCert}
           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
+          if [ ! -s /run/xrdp/rsakeys.ini ]; then
+            mkdir -p /run/xrdp
+            ${cfg.package}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini
           fi
         '';
         serviceConfig = {