commit adeab67bd80c7dc2d94152f3231c5940ae10a337 · pyrox.dev/nixpkgs

+42 -11
nixos/modules/services/networking/syncthing.nix
···

       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
       +
       

     

       26
       38
        
       in

     

       27
       39
        
       

     

       28
       40
        
       {

     
···

       38
       50
        
               to Dropbox and Bittorrent Sync. Initial interface will be

     

       39
       51
        
               available on http://127.0.0.1:8384/.

     

       40
       52
        
             '';

     

       53
       53
       +
       

     

       54
       54
       +
             useInotify = mkOption {

     

       55
       55
       +
               type = types.bool;

     

       56
       56
       +
               default = false;

     

       57
       57
       +
               description = "Provide syncthing-inotify as a service.";

     

       58
       58
       +
             };

     

       41
       59
        
       

     

       42
       60
        
             systemService = mkOption {

     

       43
       61
        
               type = types.bool;

     
···

       112
       130
        
               config.ids.gids.syncthing;

     

       113
       131
        
           };

     

       114
       132
        
       

     

       115
       115
       -
           environment.systemPackages = [ cfg.package ];

     

       133
       133
       +
           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
       +
             });

     

       116
       144
        
       

     

       117
       117
       -
           systemd.services = mkIf cfg.systemService {

     

       118
       118
       -
             syncthing = header // {

     

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

     

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

     

       120
       120
       -
               serviceConfig = service // {

     

       147
       147
       +
               serviceConfig = iNotifyService // {

     

       121
       148
        
                 User = cfg.user;

     

       122
       122
       -
                 Group = cfg.group;

     

       123
       123
       -
                 PermissionsStartOnly = true;

     

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

     

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

     

       125
       150
        
               };

     

       126
       126
       -
             };

     

       151
       151
       +
             });

     

       127
       152
        
           };

     

       128
       153
        
       

     

       129
       129
       -
           systemd.user.services.syncthing =

     

       130
       130
       -
             header // {

     

       131
       131
       -
               wantedBy = [ "default.target" ];

     

       154
       154
       +
           systemd.user.services = {

     

       155
       155
       +
             syncthing = header // {

     

       132
       156
        
               serviceConfig = service // {

     

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

     

       134
       158
        
               };

     

       135
       159
        
             };

     

       160
       160
       +
       

     

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

     

       162
       162
       +
               serviceConfig = iNotifyService // {

     

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

     

       164
       164
       +
               };

     

       165
       165
       +
             });

     

       166
       166
       +
           };

     

       136
       167
        
       

     

       137
       168
        
         };

     

       138
       169
        
       }