diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-02-26 11:04:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-26 11:04:33 +0800 |
commit | f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93 (patch) | |
tree | 8f499ef6f6d09564bb3efd3bdb6401a358ad027a /nixos | |
parent | c99fb2b5bce8b6450a03618175a6037a26964418 (diff) | |
parent | 5643128ff2ad22e5011747b63ba1f70e034c80d6 (diff) | |
download | nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.gz nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.bz2 nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.lz nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.xz nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.tar.zst nixpkgs-f9cc3c08e2eaaaaa24d527545fc7e05ee18f3f93.zip |
Merge pull request #35432 from timokau/syncthing-deprecate-inotify
syncthing,qsyncthingtray: remove syncthing-inotify
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/syncthing.nix | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index dcdc203bdc6..e485c073cbd 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -16,12 +16,6 @@ in { available on http://127.0.0.1:8384/. ''; - useInotify = mkOption { - type = types.bool; - default = false; - description = "Provide syncthing-inotify as a service."; - }; - systemService = mkOption { type = types.bool; default = true; @@ -90,6 +84,12 @@ in { }; }; + imports = [ + (mkRemovedOptionModule ["services" "syncthing" "useInotify"] '' + This option was removed because syncthing now has the inotify functionality included under the name "fswatcher". + It can be enabled on a per-folder basis through the webinterface. + '') + ]; ###### implementation @@ -100,8 +100,7 @@ in { allowedUDPPorts = [ 21027 ]; }; - systemd.packages = [ pkgs.syncthing ] - ++ lib.optional cfg.useInotify pkgs.syncthing-inotify; + systemd.packages = [ pkgs.syncthing ]; users = mkIf (cfg.user == defaultUser) { extraUsers."${defaultUser}" = @@ -125,7 +124,6 @@ in { STNOUPGRADE = "yes"; inherit (cfg) all_proxy; } // config.networking.proxy.envVars; - wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; @@ -141,20 +139,6 @@ in { syncthing-resume = { wantedBy = [ "suspend.target" ]; }; - - syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) { - description = "Syncthing Inotify File Watcher service"; - after = [ "network.target" "syncthing.service" ]; - requires = [ "syncthing.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - SuccessExitStatus = "2"; - RestartForceExitStatus = "3"; - Restart = "on-failure"; - User = cfg.user; - ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0"; - }; - }; }; }; } |