commit 1026bebee61a1664605cf58136164e47478bc2f3 · pyrox.dev/nixpkgs

+53 -62

nixos/modules/services/networking/syncthing.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
       

     

       7
       6
        
         cfg = config.services.syncthing;

     

       8
       7
        
         defaultUser = "syncthing";

     

       9
       9
       -
       

     

       10
       10
       -
         header = {

     

       11
       11
       -
           description = "Syncthing service";

     

       12
       12
       -
           after = [ "network.target" ];

     

       13
       13
       -
           environment = {

     

       14
       14
       -
             STNORESTART = "yes";

     

       15
       15
       -
             STNOUPGRADE = "yes";

     

       16
       16
       -
             inherit (cfg) all_proxy;

     

       17
       17
       -
           } // config.networking.proxy.envVars;

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         service = {

     

       21
       21
       -
           Restart = "on-failure";

     

       22
       22
       -
           SuccessExitStatus = "2 3 4";

     

       23
       23
       -
           RestartForceExitStatus="3 4";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         iNotifyHeader = {

     

       27
       27
       -
           description = "Syncthing Inotify File Watcher service";

     

       28
       28
       -
           after = [ "network.target" "syncthing.service" ];

     

       29
       29
       -
           requires = [ "syncthing.service" ];

     

       30
       30
       -
         };

     

       31
       31
       -
       

     

       32
       32
       -
         iNotifyService = {

     

       33
       33
       -
           SuccessExitStatus = "2";

     

       34
       34
       -
           RestartForceExitStatus = "3";

     

       35
       35
       -
           Restart = "on-failure";

     

       36
       36
       -
         };

     

       37
       37
       -
       

     

       38
       38
       -
       in

     

       39
       39
       -
       

     

       40
       40
       -
       {

     

       41
       41
       -
       

     

       8
       8
       +
       in {

     

       42
       9
        
         ###### interface

     

       43
       43
       -
       

     

       44
       10
        
         options = {

     

       45
       45
       -
       

     

       46
       11
        
           services.syncthing = {

     

       47
       12
        
       

     

       48
       13
        
             enable = mkEnableOption ''

     
···

       100
       65
        
               '';

     

       101
       66
        
             };

     

       102
       67
        
       

     

       68
       68
       +
             openDefaultPorts = mkOption {

     

       69
       69
       +
               type = types.bool;

     

       70
       70
       +
               default = false;

     

       71
       71
       +
               example = literalExample "true";

     

       72
       72
       +
               description = ''

     

       73
       73
       +
                 Open the default ports in the firewall:

     

       74
       74
       +
                   - TCP 22000 for transfers

     

       75
       75
       +
                   - UDP 21027 for discovery

     

       76
       76
       +
                 If multiple users are running syncthing on this machine, you will need to manually open a set of ports for each instance and leave this disabled.

     

       77
       77
       +
                 Alternatively, if are running only a single instance on this machine using the default ports, enable this.

     

       78
       78
       +
               '';

     

       79
       79
       +
             };

     

       80
       80
       +
       

     

       103
       81
        
             package = mkOption {

     

       104
       82
        
               type = types.package;

     

       105
       83
        
               default = pkgs.syncthing;

     
···

       116
       94
        
         ###### implementation

     

       117
       95
        
       

     

       118
       96
        
         config = mkIf cfg.enable {

     

       97
       97
       +
       

     

       98
       98
       +
           networking.firewall = mkIf cfg.openDefaultPorts {

     

       99
       99
       +
             allowedTCPPorts = [ 22000 ];

     

       100
       100
       +
             allowedUDPPorts = [ 21027 ];

     

       101
       101
       +
           };

     

       102
       102
       +
       

     

       103
       103
       +
           systemd.packages = [ pkgs.syncthing ]

     

       104
       104
       +
                              ++ lib.optional cfg.useInotify pkgs.syncthing-inotify;

     

       119
       105
        
       

     

       120
       106
        
           users = mkIf (cfg.user == defaultUser) {

     

       121
       107
        
             extraUsers."${defaultUser}" =

     
···

       131
       117
        
           };

     

       132
       118
        
       

     

       133
       119
        
           systemd.services = {

     

       134
       134
       -
             syncthing = mkIf cfg.systemService (header // {

     

       135
       135
       -
                 wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];

     

       136
       136
       -
                 wantedBy = [ "multi-user.target" ];

     

       137
       137
       -
                 serviceConfig = service // {

     

       138
       138
       -
                   User = cfg.user;

     

       139
       139
       -
                   Group = cfg.group;

     

       140
       140
       -
                   PermissionsStartOnly = true;

     

       141
       141
       -
                   ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";

     

       142
       142
       -
                 };

     

       143
       143
       -
             });

     

       144
       144
       -
       

     

       145
       145
       -
             syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) (iNotifyHeader // {

     

       120
       120
       +
             syncthing = mkIf cfg.systemService {

     

       121
       121
       +
               description = "Syncthing service";

     

       122
       122
       +
               after = [ "network.target" ];

     

       123
       123
       +
               environment = {

     

       124
       124
       +
                 STNORESTART = "yes";

     

       125
       125
       +
                 STNOUPGRADE = "yes";

     

       126
       126
       +
                 inherit (cfg) all_proxy;

     

       127
       127
       +
               } // config.networking.proxy.envVars;

     

       128
       128
       +
               wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ];

     

       146
       129
        
               wantedBy = [ "multi-user.target" ];

     

       147
       147
       -
               serviceConfig = iNotifyService // {

     

       130
       130
       +
               serviceConfig = {

     

       131
       131
       +
                 Restart = "on-failure";

     

       132
       132
       +
                 SuccessExitStatus = "2 3 4";

     

       133
       133
       +
                 RestartForceExitStatus="3 4";

     

       148
       134
        
                 User = cfg.user;

     

       149
       149
       -
                 ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";

     

       135
       135
       +
                 Group = cfg.group;

     

       136
       136
       +
                 PermissionsStartOnly = true;

     

       137
       137
       +
                 ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";

     

       150
       138
        
               };

     

       151
       151
       -
             });

     

       152
       152
       -
           };

     

       139
       139
       +
             };

     

       153
       140
        
       

     

       154
       154
       -
           systemd.user.services = {

     

       155
       155
       -
             syncthing = header // {

     

       156
       156
       -
               serviceConfig = service // {

     

       157
       157
       -
                 ExecStart = "${cfg.package}/bin/syncthing -no-browser";

     

       158
       158
       -
               };

     

       141
       141
       +
             syncthing-resume = {

     

       142
       142
       +
               wantedBy = [ "suspend.target" ];

     

       159
       143
        
             };

     

       160
       144
        
       

     

       161
       161
       -
             syncthing-inotify = mkIf cfg.useInotify (iNotifyHeader // {

     

       162
       162
       -
               serviceConfig = iNotifyService // {

     

       163
       163
       -
                 ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -logflags=0";

     

       145
       145
       +
             syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) {

     

       146
       146
       +
               description = "Syncthing Inotify File Watcher service";

     

       147
       147
       +
               after = [ "network.target" "syncthing.service" ];

     

       148
       148
       +
               requires = [ "syncthing.service" ];

     

       149
       149
       +
               wantedBy = [ "multi-user.target" ];

     

       150
       150
       +
               serviceConfig = {

     

       151
       151
       +
                 SuccessExitStatus = "2";

     

       152
       152
       +
                 RestartForceExitStatus = "3";

     

       153
       153
       +
                 Restart = "on-failure";

     

       154
       154
       +
                 User = cfg.user;

     

       155
       155
       +
                 ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0";

     

       164
       156
        
               };

     

       165
       165
       -
             });

     

       157
       157
       +
             };

     

       166
       158
        
           };

     

       167
       167
       -
       

     

       168
       159
        
         };

     

       169
       160
        
       }

+16 -3

pkgs/applications/networking/syncthing/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, go }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, go, pkgs }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "0.14.8";

     
···

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         installPhase = ''

     

       28
       28
       -
           mkdir -p $out/bin

     

       28
       28
       +
           mkdir -p $out/bin $out/etc/systemd/{system,user}

     

       29
       29
       +
       

     

       29
       30
        
           cp bin/* $out/bin

     

       31
       31
       +
         '' + lib.optionalString (stdenv.isLinux) ''

     

       32
       32
       +
           substitute etc/linux-systemd/system/syncthing-resume.service \

     

       33
       33
       +
                      $out/etc/systemd/system/syncthing-resume.service \

     

       34
       34
       +
                      --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill

     

       35
       35
       +
       

     

       36
       36
       +
           substitute etc/linux-systemd/system/syncthing@.service \

     

       37
       37
       +
                      $out/etc/systemd/system/syncthing@.service \

     

       38
       38
       +
                      --replace /usr/bin/syncthing $out/bin/syncthing

     

       39
       39
       +
       

     

       40
       40
       +
           substitute etc/linux-systemd/user/syncthing.service \

     

       41
       41
       +
                      $out/etc/systemd/user/syncthing.service \

     

       42
       42
       +
                      --replace /usr/bin/syncthing $out/bin/syncthing

     

       30
       43
        
         '';

     

       31
       44
        
       

     

       32
       32
       -
         meta = {

     

       45
       45
       +
         meta = with stdenv.lib; {

     

       33
       46
        
           homepage = https://www.syncthing.net/;

     

       34
       47
        
           description = "Open Source Continuous File Synchronization";

     

       35
       48
        
           license = stdenv.lib.licenses.mpl20;

+16 -5

pkgs/applications/networking/syncthing/inotify.nix

···

       15
       15
        
       

     

       16
       16
        
         goDeps = ./inotify-deps.nix;

     

       17
       17
        
       

     

       18
       18
       -
         meta = {

     

       18
       18
       +
         postInstall = ''

     

       19
       19
       +
           mkdir -p $bin/etc/systemd/{system,user}

     

       20
       20
       +
       

     

       21
       21
       +
           substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \

     

       22
       22
       +
                      $bin/etc/systemd/system/syncthing-inotify@.service \

     

       23
       23
       +
                      --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify

     

       24
       24
       +
       

     

       25
       25
       +
           substitute $src/etc/linux-systemd/user/syncthing-inotify.service \

     

       26
       26
       +
                      $bin/etc/systemd/user/syncthing-inotify.service \

     

       27
       27
       +
                      --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       19
       31
        
           homepage = https://github.com/syncthing/syncthing-inotify;

     

       20
       32
        
           description = "File watcher intended for use with Syncthing";

     

       21
       21
       -
           license = stdenv.lib.licenses.mpl20;

     

       22
       22
       -
           maintainers = with stdenv.lib.maintainers; [ joko ];

     

       23
       23
       -
           platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;

     

       33
       33
       +
           license = licenses.mpl20;

     

       34
       34
       +
           maintainers = with maintainers; [ joko peterhoeg ];

     

       35
       35
       +
           platforms = platforms.unix;

     

       24
       36
        
         };

     

       25
       25
       -
       

     

       26
       37
        
       }