commit 60e13131b651d6055425bb067c0a03369c38500f · pyrox.dev/nixpkgs

+9 -3

nixos/modules/services/backup/btrbk.nix

···

       51
       51
        
           '';

     

       52
       52
        
       in

     

       53
       53
        
       {

     

       54
       54
       +
         meta.maintainers = with lib.maintainers; [ oxalica ];

     

       55
       55
       +
       

     

       54
       56
        
         options = {

     

       55
       57
        
           services.btrbk = {

     

       56
       58
        
             extraPackages = lib.mkOption {

     
···

       76
       78
        
                   submodule {

     

       77
       79
        
                     options = {

     

       78
       80
        
                       onCalendar = lib.mkOption {

     

       79
       79
       -
                         type = lib.types.str;

     

       81
       81
       +
                         type = lib.types.nullOr lib.types.str;

     

       80
       82
        
                         default = "daily";

     

       81
       81
       -
                         description = "How often this btrbk instance is started. See systemd.time(7) for more information about the format.";

     

       83
       83
       +
                         description = ''

     

       84
       84
       +
                           How often this btrbk instance is started. See systemd.time(7) for more information about the format.

     

       85
       85
       +
                           Setting it to null disables the timer, thus this instance can only be started manually.

     

       86
       86
       +
                         '';

     

       82
       87
        
                       };

     

       83
       88
        
                       settings = lib.mkOption {

     

       84
       89
        
                         type = let t = lib.types.attrsOf (lib.types.either lib.types.str (t // { description = "instances of this type recursively"; })); in t;

     
···

       214
       219
        
                 };

     

       215
       220
        
               }

     

       216
       221
        
             )

     

       217
       217
       -
             cfg.instances;

     

       222
       222
       +
             (lib.filterAttrs (name: instance: instance.onCalendar != null)

     

       223
       223
       +
               cfg.instances);

     

       218
       224
        
         };

     

       219
       225
        
       

     

       220
       226
        
       }

nixos/tests/all-tests.nix

···

       62
       62
        
         breitbandmessung = handleTest ./breitbandmessung.nix {};

     

       63
       63
        
         brscan5 = handleTest ./brscan5.nix {};

     

       64
       64
        
         btrbk = handleTest ./btrbk.nix {};

     

       65
       65
       +
         btrbk-no-timer = handleTest ./btrbk-no-timer.nix {};

     

       65
       66
        
         buildbot = handleTest ./buildbot.nix {};

     

       66
       67
        
         buildkite-agents = handleTest ./buildkite-agents.nix {};

     

       67
       68
        
         caddy = handleTest ./caddy.nix {};

+37

nixos/tests/btrbk-no-timer.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ lib, pkgs, ... }:

     

       2
       2
       +
         {

     

       3
       3
       +
           name = "btrbk-no-timer";

     

       4
       4
       +
           meta.maintainers = with lib.maintainers; [ oxalica ];

     

       5
       5
       +
       

     

       6
       6
       +
           nodes.machine = { ... }: {

     

       7
       7
       +
             environment.systemPackages = with pkgs; [ btrfs-progs ];

     

       8
       8
       +
             services.btrbk.instances.local = {

     

       9
       9
       +
               onCalendar = null;

     

       10
       10
       +
               settings.volume."/mnt" = {

     

       11
       11
       +
                 snapshot_dir = "btrbk/local";

     

       12
       12
       +
                 subvolume = "to_backup";

     

       13
       13
       +
               };

     

       14
       14
       +
             };

     

       15
       15
       +
           };

     

       16
       16
       +
       

     

       17
       17
       +
           testScript = ''

     

       18
       18
       +
             start_all()

     

       19
       19
       +
       

     

       20
       20
       +
             # Create btrfs partition at /mnt

     

       21
       21
       +
             machine.succeed("truncate --size=128M /data_fs")

     

       22
       22
       +
             machine.succeed("mkfs.btrfs /data_fs")

     

       23
       23
       +
             machine.succeed("mkdir /mnt")

     

       24
       24
       +
             machine.succeed("mount /data_fs /mnt")

     

       25
       25
       +
             machine.succeed("btrfs subvolume create /mnt/to_backup")

     

       26
       26
       +
             machine.succeed("mkdir -p /mnt/btrbk/local")

     

       27
       27
       +
       

     

       28
       28
       +
             # The service should not have any triggering timer.

     

       29
       29
       +
             unit = machine.get_unit_info('btrbk-local.service')

     

       30
       30
       +
             assert "TriggeredBy" not in unit

     

       31
       31
       +
       

     

       32
       32
       +
             # Manually starting the service should still work.

     

       33
       33
       +
             machine.succeed("echo foo > /mnt/to_backup/bar")

     

       34
       34
       +
             machine.start_job("btrbk-local.service")

     

       35
       35
       +
             machine.wait_until_succeeds("cat /mnt/btrbk/local/*/bar | grep foo")

     

       36
       36
       +
           '';

     

       37
       37
       +
         })