commit 647ed242dcfbebd62b5f5e6880da347ac705544f · pyrox.dev/nixpkgs

+12 -8

nixos/modules/services/networking/adguardhome.nix

···

       51
       51
        
           };

     

       52
       52
        
       

     

       53
       53
        
           settings = mkOption {

     

       54
       54
       -
             default = { };

     

       55
       55
       -
             type = submodule {

     

       54
       54
       +
             default = null;

     

       55
       55
       +
             type = nullOr (submodule {

     

       56
       56
        
               freeformType = (pkgs.formats.yaml { }).type;

     

       57
       57
        
               options = {

     

       58
       58
        
                 schema_version = mkOption {

     
···

       79
       79
        
                   '';

     

       80
       80
        
                 };

     

       81
       81
        
               };

     

       82
       82
       -
             };

     

       82
       82
       +
             });

     

       83
       83
        
             description = lib.mdDoc ''

     

       84
       84
        
               AdGuard Home configuration. Refer to

     

       85
       85
        
               <https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#configuration-file>

     
···

       89
       89
        
               On start and if {option}`mutableSettings` is `true`,

     

       90
       90
        
               these options are merged into the configuration file on start, taking

     

       91
       91
        
               precedence over configuration changes made on the web interface.

     

       92
       92
       +
       

     

       93
       93
       +
               Set this to `null` (default) for a non-declarative configuration without any

     

       94
       94
       +
               Nix-supplied values.

     

       95
       95
       +
               Declarative configurations are supplied with a default `schema_version`, `bind_host`, and `bind_port`.

     

       92
       96
        
               :::

     

       93
       97
        
             '';

     

       94
       98
        
           };

     
···

       105
       109
        
         config = mkIf cfg.enable {

     

       106
       110
        
           assertions = [

     

       107
       111
        
             {

     

       108
       108
       -
               assertion = cfg.settings != { }

     

       109
       109
       -
                 -> (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)

     

       112
       112
       +
               assertion = cfg.settings != null -> cfg.mutableSettings

     

       113
       113
       +
                 || (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)

     

       110
       114
        
                 || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings);

     

       111
       115
        
               message =

     

       112
       116
        
                 "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration";

     

       113
       117
        
             }

     

       114
       118
        
             {

     

       115
       115
       -
               assertion = cfg.settings != { }

     

       116
       116
       -
                 -> hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;

     

       119
       119
       +
               assertion = cfg.settings != null -> cfg.mutableSettings

     

       120
       120
       +
                 || hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;

     

       117
       121
        
               message =

     

       118
       122
        
                 "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration";

     

       119
       123
        
             }

     
···

       128
       132
        
               StartLimitBurst = 10;

     

       129
       133
        
             };

     

       130
       134
        
       

     

       131
       131
       -
             preStart = optionalString (cfg.settings != { }) ''

     

       135
       135
       +
             preStart = optionalString (cfg.settings != null) ''

     

       132
       136
        
               if    [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \

     

       133
       137
        
                  && [ "${toString cfg.mutableSettings}" = "1" ]; then

     

       134
       138
        
                 # Writing directly to AdGuardHome.yaml results in empty file

+16

nixos/tests/adguardhome.nix

···

       2
       2
        
         name = "adguardhome";

     

       3
       3
        
       

     

       4
       4
        
         nodes = {

     

       5
       5
       +
           nullConf = { ... }: { services.adguardhome = { enable = true; }; };

     

       6
       6
       +
       

     

       7
       7
       +
           emptyConf = { lib, ... }: {

     

       8
       8
       +
             services.adguardhome = {

     

       9
       9
       +
               enable = true;

     

       10
       10
       +
               settings = {};

     

       11
       11
       +
             };

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       5
       14
        
           declarativeConf = { ... }: {

     

       6
       15
        
             services.adguardhome = {

     

       7
       16
        
               enable = true;

     
···

       34
       43
        
         };

     

       35
       44
        
       

     

       36
       45
        
         testScript = ''

     

       46
       46
       +
           with subtest("Minimal (settings = null) config test"):

     

       47
       47
       +
               nullConf.wait_for_unit("adguardhome.service")

     

       48
       48
       +
       

     

       49
       49
       +
           with subtest("Default config test"):

     

       50
       50
       +
               emptyConf.wait_for_unit("adguardhome.service")

     

       51
       51
       +
               emptyConf.wait_for_open_port(3000)

     

       52
       52
       +
       

     

       37
       53
        
           with subtest("Declarative config test, DNS will be reachable"):

     

       38
       54
        
               declarativeConf.wait_for_unit("adguardhome.service")

     

       39
       55
        
               declarativeConf.wait_for_open_port(53)