commit f32d7e4e032e83955659ba31bdcdc605ff0dfbab · pyrox.dev/nixpkgs

+55 -5

nixos/modules/services/network-filesystems/rsyncd.nix

···

       46
       46
        
               '';

     

       47
       47
        
             };

     

       48
       48
        
       

     

       49
       49
       +
             socketActivated = mkOption {

     

       50
       50
       +
               default = false;

     

       51
       51
       +
               type = types.bool;

     

       52
       52
       +
               description =

     

       53
       53
       +
                 "If enabled Rsync will be socket-activated rather than run persistently.";

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       49
       56
        
           };

     

       50
       57
        
         };

     

       51
       58
        
       

     
···

       63
       70
        
       

     

       64
       71
        
           services.rsyncd.settings.global.port = toString cfg.port;

     

       65
       72
        
       

     

       66
       66
       -
           systemd.services.rsyncd = {

     

       67
       67
       -
             description = "Rsync daemon";

     

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

     

       69
       69
       -
             serviceConfig.ExecStart =

     

       70
       70
       -
               "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}";

     

       73
       73
       +
           systemd = let

     

       74
       74
       +
             serviceConfigSecurity = {

     

       75
       75
       +
               ProtectSystem = "full";

     

       76
       76
       +
               PrivateDevices = "on";

     

       77
       77
       +
               NoNewPrivileges = "on";

     

       78
       78
       +
             };

     

       79
       79
       +
           in {

     

       80
       80
       +
             services.rsync = {

     

       81
       81
       +
               enable = !cfg.socketActivated;

     

       82
       82
       +
               aliases = [ "rsyncd" ];

     

       83
       83
       +
       

     

       84
       84
       +
               description = "fast remote file copy program daemon";

     

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

     

       86
       86
       +
               documentation = [ "man:rsync(1)" "man:rsyncd.conf(5)" ];

     

       87
       87
       +
       

     

       88
       88
       +
               serviceConfig = serviceConfigSecurity // {

     

       89
       89
       +
                 ExecStart =

     

       90
       90
       +
                   "${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}";

     

       91
       91
       +
                 RestartSec = 1;

     

       92
       92
       +
               };

     

       93
       93
       +
       

     

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

     

       95
       95
       +
             };

     

       96
       96
       +
       

     

       97
       97
       +
             services."rsync@" = {

     

       98
       98
       +
               description = "fast remote file copy program daemon";

     

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

     

       100
       100
       +
       

     

       101
       101
       +
               serviceConfig = serviceConfigSecurity // {

     

       102
       102
       +
                 ExecStart = "${pkgs.rsync}/bin/rsync --daemon --config=${configFile}";

     

       103
       103
       +
                 StandardInput = "socket";

     

       104
       104
       +
                 StandardOutput = "inherit";

     

       105
       105
       +
                 StandardError = "journal";

     

       106
       106
       +
               };

     

       107
       107
       +
             };

     

       108
       108
       +
       

     

       109
       109
       +
             sockets.rsync = {

     

       110
       110
       +
               enable = cfg.socketActivated;

     

       111
       111
       +
       

     

       112
       112
       +
               description = "socket for fast remote file copy program daemon";

     

       113
       113
       +
               conflicts = [ "rsync.service" ];

     

       114
       114
       +
       

     

       115
       115
       +
               listenStreams = [ (toString cfg.port) ];

     

       116
       116
       +
               socketConfig.Accept = true;

     

       117
       117
       +
       

     

       118
       118
       +
               wantedBy = [ "sockets.target" ];

     

       119
       119
       +
             };

     

       71
       120
        
           };

     

       121
       121
       +
       

     

       72
       122
        
         };

     

       73
       123
        
       

     

       74
       124
        
         meta.maintainers = with lib.maintainers; [ ehmry ];

+25 -14

nixos/tests/rsyncd.nix

···

       2
       2
        
         name = "rsyncd";

     

       3
       3
        
         meta.maintainers = with pkgs.lib.maintainers; [ ehmry ];

     

       4
       4
        
       

     

       5
       5
       -
         nodes.machine.services.rsyncd = {

     

       6
       6
       -
           enable = true;

     

       7
       7
       -
           settings = {

     

       8
       8
       -
             global = {

     

       9
       9
       -
               "reverse lookup" = false;

     

       10
       10
       -
               "forward lookup" = false;

     

       5
       5
       +
         nodes = let

     

       6
       6
       +
           mkNode = socketActivated:

     

       7
       7
       +
             { config, ... }: {

     

       8
       8
       +
               networking.firewall.allowedTCPPorts = [ config.services.rsyncd.port ];

     

       9
       9
       +
               services.rsyncd = {

     

       10
       10
       +
                 enable = true;

     

       11
       11
       +
                 inherit socketActivated;

     

       12
       12
       +
                 settings = {

     

       13
       13
       +
                   global = {

     

       14
       14
       +
                     "reverse lookup" = false;

     

       15
       15
       +
                     "forward lookup" = false;

     

       16
       16
       +
                   };

     

       17
       17
       +
                   tmp = {

     

       18
       18
       +
                     path = "/nix/store";

     

       19
       19
       +
                     comment = "test module";

     

       20
       20
       +
                   };

     

       21
       21
       +
                 };

     

       22
       22
       +
               };

     

       11
       23
        
             };

     

       12
       12
       -
             tmp = {

     

       13
       13
       -
               path = "/nix/store";

     

       14
       14
       -
               comment = "test module";

     

       15
       15
       -
             };

     

       16
       16
       -
       

     

       17
       17
       -
           };

     

       24
       24
       +
         in {

     

       25
       25
       +
           a = mkNode false;

     

       26
       26
       +
           b = mkNode true;

     

       18
       27
        
         };

     

       19
       28
        
       

     

       20
       29
        
         testScript = ''

     

       21
       30
        
           start_all()

     

       22
       22
       -
           machine.wait_for_unit("rsyncd")

     

       23
       23
       -
           machine.succeed("rsync localhost::")

     

       31
       31
       +
           a.wait_for_unit("rsync")

     

       32
       32
       +
           b.wait_for_unit("sockets.target")

     

       33
       33
       +
           b.succeed("rsync a::")

     

       34
       34
       +
           a.succeed("rsync b::")

     

       24
       35
        
         '';

     

       25
       36
        
       })