summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorDaniƫl de Kok <me@danieldk.eu>2020-07-20 11:31:36 +0200
committerGitHub <noreply@github.com>2020-07-20 11:31:36 +0200
commitd0c12dc612bef680d129df40cbe7d80981a1e51c (patch)
tree0440de209154d8c00074abfea684ec8fabe87b22 /nixos
parenta41fb93355d33dd390884c795a6be5f7bae2ffea (diff)
parentb9e0992e879667afc29104af5b9f95cd87a26d79 (diff)
downloadnixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.tar
nixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.tar.gz
nixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.tar.bz2
nixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.tar.lz
nixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.tar.xz
nixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.tar.zst
nixpkgs-d0c12dc612bef680d129df40cbe7d80981a1e51c.zip
Merge pull request #85689 from danieldk/resilio-module-fix
nixos/resilio: fix directoryRoot configuration
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/resilio.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 266318296d7..6193d7340fc 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -30,12 +30,12 @@ let
     download_limit = cfg.downloadLimit;
     upload_limit = cfg.uploadLimit;
     lan_encrypt_data = cfg.encryptLAN;
-  } // optionalAttrs cfg.enableWebUI {
+  } // optionalAttrs (cfg.directoryRoot != "") { directory_root = cfg.directoryRoot; }
+    // optionalAttrs cfg.enableWebUI {
     webui = { listen = "${cfg.httpListenAddr}:${toString cfg.httpListenPort}"; } //
       (optionalAttrs (cfg.httpLogin != "") { login = cfg.httpLogin; }) //
       (optionalAttrs (cfg.httpPass != "") { password = cfg.httpPass; }) //
-      (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; }) //
-      (optionalAttrs (cfg.directoryRoot != "") { directory_root = cfg.directoryRoot; });
+      (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; });
   } // optionalAttrs (sharedFoldersRecord != []) {
     shared_folders = sharedFoldersRecord;
   }));