diff options
author | Timo Kaufmann <timokau@zoho.com> | 2018-02-23 19:59:06 +0100 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2018-02-24 01:08:44 +0100 |
commit | 5643128ff2ad22e5011747b63ba1f70e034c80d6 (patch) | |
tree | cfaec3ed9fe8f7fa9af40d39a3f8a7d4c7138808 /nixos/modules/services | |
parent | 7d37688d66bf830767ae39724406abd78347fcfb (diff) | |
download | nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.tar nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.tar.gz nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.tar.bz2 nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.tar.lz nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.tar.xz nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.tar.zst nixlib-5643128ff2ad22e5011747b63ba1f70e034c80d6.zip |
syncthing,qsyncthingtray: remove syncthing-inotify
syncthing-inotify is replaced by the new syncthing "fswatcher" feature.
Diffstat (limited to 'nixos/modules/services')
-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 dcdc203bdc62..e485c073cbdd 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"; - }; - }; }; }; } |