commit c60dd90d1f04f58ad631a546e732bd1e706dbdf2 · pyrox.dev/nixpkgs

+69 -51

nixos/modules/services/networking/adguardhome.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.adguardhome;

     

       7
       7
       +
         settingsFormat = pkgs.formats.yaml { };

     

       7
       8
        
       

     

       8
       9
        
         args = concatStringsSep " " ([

     

       9
       10
        
           "--no-check-update"

     
···

       12
       13
        
           "--config /var/lib/AdGuardHome/AdGuardHome.yaml"

     

       13
       14
        
         ] ++ cfg.extraArgs);

     

       14
       15
        
       

     

       15
       15
       -
         configFile = pkgs.writeTextFile {

     

       16
       16
       -
           name = "AdGuardHome.yaml";

     

       17
       17
       -
           text = builtins.toJSON cfg.settings;

     

       18
       18
       -
           checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config";

     

       19
       19
       -
         };

     

       20
       20
       -
         defaultBindPort = 3000;

     

       21
       21
       -
       

     

       22
       22
       -
       in

     

       23
       23
       -
       {

     

       24
       24
       -
       

     

       25
       25
       -
         imports =

     

       26
       26
       -
           let cfgPath = [ "services" "adguardhome" ];

     

       27
       27
       -
           in

     

       28
       28
       -
           [

     

       29
       29
       -
             (mkRenamedOptionModuleWith { sinceRelease = 2211; from = cfgPath ++ [ "host" ]; to = cfgPath ++ [ "settings" "bind_host" ]; })

     

       30
       30
       -
             (mkRenamedOptionModuleWith { sinceRelease = 2211; from = cfgPath ++ [ "port" ]; to = cfgPath ++ [ "settings" "bind_port" ]; })

     

       31
       31
       -
           ];

     

       16
       16
       +
         settings = if (cfg.settings != null) then

     

       17
       17
       +
           cfg.settings // (if cfg.settings.schema_version < 23 then {

     

       18
       18
       +
             bind_host = cfg.host;

     

       19
       19
       +
             bind_port = cfg.port;

     

       20
       20
       +
           } else {

     

       21
       21
       +
             http.address = "${cfg.host}:${toString cfg.port}";

     

       22
       22
       +
           })

     

       23
       23
       +
         else

     

       24
       24
       +
           null;

     

       32
       25
        
       

     

       26
       26
       +
         configFile =

     

       27
       27
       +
           (settingsFormat.generate "AdGuardHome.yaml" settings).overrideAttrs (_: {

     

       28
       28
       +
             checkPhase = "${cfg.package}/bin/adguardhome -c $out --check-config";

     

       29
       29
       +
           });

     

       30
       30
       +
       in {

     

       33
       31
        
         options.services.adguardhome = with types; {

     

       34
       32
        
           enable = mkEnableOption "AdGuard Home network-wide ad blocker";

     

       35
       33
        
       

     

       34
       34
       +
           package = mkOption {

     

       35
       35
       +
             type = package;

     

       36
       36
       +
             default = pkgs.adguardhome;

     

       37
       37
       +
             defaultText = literalExpression "pkgs.adguardhome";

     

       38
       38
       +
             description = ''

     

       39
       39
       +
               The package that runs adguardhome.

     

       40
       40
       +
             '';

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       36
       43
        
           openFirewall = mkOption {

     

       37
       44
        
             default = false;

     

       38
       45
        
             type = bool;

     
···

       43
       50
        
           };

     

       44
       51
        
       

     

       45
       52
        
           allowDHCP = mkOption {

     

       46
       46
       -
             default = cfg.settings.dhcp.enabled or false;

     

       47
       47
       -
             defaultText = literalExpression ''config.services.adguardhome.settings.dhcp.enabled or false'';

     

       53
       53
       +
             default = settings.dhcp.enabled or false;

     

       54
       54
       +
             defaultText = literalExpression "config.services.adguardhome.settings.dhcp.enabled or false";

     

       48
       55
        
             type = bool;

     

       49
       56
        
             description = ''

     

       50
       57
        
               Allows AdGuard Home to open raw sockets (`CAP_NET_RAW`), which is

     
···

       65
       72
        
             '';

     

       66
       73
        
           };

     

       67
       74
        
       

     

       75
       75
       +
           host = mkOption {

     

       76
       76
       +
             default = "0.0.0.0";

     

       77
       77
       +
             type = str;

     

       78
       78
       +
             description = ''

     

       79
       79
       +
               Host address to bind HTTP server to.

     

       80
       80
       +
             '';

     

       81
       81
       +
           };

     

       82
       82
       +
       

     

       83
       83
       +
           port = mkOption {

     

       84
       84
       +
             default = 3000;

     

       85
       85
       +
             type = port;

     

       86
       86
       +
             description = ''

     

       87
       87
       +
               Port to serve HTTP pages on.

     

       88
       88
       +
             '';

     

       89
       89
       +
           };

     

       90
       90
       +
       

     

       68
       91
        
           settings = mkOption {

     

       69
       92
        
             default = null;

     

       70
       93
        
             type = nullOr (submodule {

     

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

     

       94
       94
       +
               freeformType = settingsFormat.type;

     

       72
       95
        
               options = {

     

       73
       96
        
                 schema_version = mkOption {

     

       74
       74
       -
                   default = pkgs.adguardhome.schema_version;

     

       75
       75
       -
                   defaultText = literalExpression "pkgs.adguardhome.schema_version";

     

       97
       97
       +
                   default = cfg.package.schema_version;

     

       98
       98
       +
                   defaultText = literalExpression "cfg.package.schema_version";

     

       76
       99
        
                   type = int;

     

       77
       100
        
                   description = ''

     

       78
       101
        
                     Schema version for the configuration.

     

       79
       79
       -
                     Defaults to the `schema_version` supplied by `pkgs.adguardhome`.

     

       80
       80
       -
                   '';

     

       81
       81
       -
                 };

     

       82
       82
       -
                 bind_host = mkOption {

     

       83
       83
       -
                   default = "0.0.0.0";

     

       84
       84
       -
                   type = str;

     

       85
       85
       -
                   description = ''

     

       86
       86
       -
                     Host address to bind HTTP server to.

     

       87
       87
       -
                   '';

     

       88
       88
       -
                 };

     

       89
       89
       -
                 bind_port = mkOption {

     

       90
       90
       -
                   default = defaultBindPort;

     

       91
       91
       -
                   type = port;

     

       92
       92
       -
                   description = ''

     

       93
       93
       -
                     Port to serve HTTP pages on.

     

       102
       102
       +
                     Defaults to the `schema_version` supplied by `cfg.package`.

     

       94
       103
        
                   '';

     

       95
       104
        
                 };

     

       96
       105
        
               };

     
···

       107
       116
        
       

     

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

     

       109
       118
        
               Nix-supplied values.

     

       110
       110
       -
               Declarative configurations are supplied with a default `schema_version`, `bind_host`, and `bind_port`.

     

       119
       119
       +
               Declarative configurations are supplied with a default `schema_version`, and `http.address`.

     

       111
       120
        
               :::

     

       112
       121
        
             '';

     

       113
       122
        
           };

     
···

       124
       133
        
         config = mkIf cfg.enable {

     

       125
       134
        
           assertions = [

     

       126
       135
        
             {

     

       127
       127
       -
               assertion = cfg.settings != null -> cfg.mutableSettings

     

       128
       128
       -
                 || (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)

     

       129
       129
       -
                 || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings);

     

       130
       130
       -
               message =

     

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

     

       136
       136
       +
               assertion = cfg.settings != null

     

       137
       137
       +
                 -> !(hasAttrByPath [ "bind_host" ] cfg.settings);

     

       138
       138
       +
               message = "AdGuard option `settings.bind_host' has been superseded by `services.adguardhome.host'";

     

       139
       139
       +
             }

     

       140
       140
       +
             {

     

       141
       141
       +
               assertion = cfg.settings != null

     

       142
       142
       +
                 -> !(hasAttrByPath [ "bind_port" ] cfg.settings);

     

       143
       143
       +
               message = "AdGuard option `settings.bind_host' has been superseded by `services.adguardhome.port'";

     

       132
       144
        
             }

     

       133
       145
        
             {

     

       134
       134
       -
               assertion = cfg.settings != null -> cfg.mutableSettings

     

       135
       135
       -
                 || hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;

     

       136
       136
       -
               message =

     

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

     

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

     

       147
       147
       +
                 || hasAttrByPath [ "dns" "bootstrap_dns" ] settings;

     

       148
       148
       +
               message = "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration";

     

       149
       149
       +
             }

     

       150
       150
       +
             {

     

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

     

       152
       152
       +
                 || hasAttrByPath [ "dns" "bootstrap_dns" ] settings

     

       153
       153
       +
                 && isList settings.dns.bootstrap_dns;

     

       154
       154
       +
               message = "AdGuard setting dns.bootstrap_dns needs to be a list";

     

       138
       155
        
             }

     

       139
       156
        
           ];

     

       140
       157
        
       

     
···

       147
       164
        
               StartLimitBurst = 10;

     

       148
       165
        
             };

     

       149
       166
        
       

     

       150
       150
       -
             preStart = optionalString (cfg.settings != null) ''

     

       167
       167
       +
             preStart = optionalString (settings != null) ''

     

       151
       168
        
               if    [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \

     

       152
       169
        
                  && [ "${toString cfg.mutableSettings}" = "1" ]; then

     

       153
       170
        
                 # Writing directly to AdGuardHome.yaml results in empty file

     
···

       161
       178
        
       

     

       162
       179
        
             serviceConfig = {

     

       163
       180
        
               DynamicUser = true;

     

       164
       164
       -
               ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}";

     

       165
       165
       -
               AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ] ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ];

     

       181
       181
       +
               ExecStart = "${cfg.package}/bin/adguardhome ${args}";

     

       182
       182
       +
               AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]

     

       183
       183
       +
                 ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ];

     

       166
       184
        
               Restart = "always";

     

       167
       185
        
               RestartSec = 10;

     

       168
       186
        
               RuntimeDirectory = "AdGuardHome";

     
···

       170
       188
        
             };

     

       171
       189
        
           };

     

       172
       190
        
       

     

       173
       173
       -
           networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port or defaultBindPort ];

     

       191
       191
       +
           networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];

     

       174
       192
        
         };

     

       175
       193
        
       }

+42 -43

nixos/tests/adguardhome.nix

···

       2
       2
        
         name = "adguardhome";

     

       3
       3
        
       

     

       4
       4
        
         nodes = {

     

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

     

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

     

       6
       6
        
       

     

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

     

       7
       7
       +
           emptyConf = {

     

       8
       8
        
             services.adguardhome = {

     

       9
       9
        
               enable = true;

     

       10
       10
       +
       

     

       11
       11
       +
               settings = { };

     

       10
       12
        
             };

     

       11
       13
        
           };

     

       12
       14
        
       

     

       13
       13
       -
           declarativeConf = { ... }: {

     

       15
       15
       +
           schemaVersionBefore23 = {

     

       16
       16
       +
             services.adguardhome = {

     

       17
       17
       +
               enable = true;

     

       18
       18
       +
       

     

       19
       19
       +
               settings.schema_version = 20;

     

       20
       20
       +
             };

     

       21
       21
       +
           };

     

       22
       22
       +
       

     

       23
       23
       +
           declarativeConf = {

     

       14
       24
        
             services.adguardhome = {

     

       15
       25
        
               enable = true;

     

       16
       26
        
       

     

       17
       27
        
               mutableSettings = false;

     

       18
       18
       -
               settings = {

     

       19
       19
       -
                 schema_version = 0;

     

       20
       20
       -
                 dns = {

     

       21
       21
       -
                   bind_host = "0.0.0.0";

     

       22
       22
       -
                   bootstrap_dns = "127.0.0.1";

     

       23
       23
       -
                 };

     

       24
       24
       -
               };

     

       28
       28
       +
               settings.dns.bootstrap_dns = [ "127.0.0.1" ];

     

       25
       29
        
             };

     

       26
       30
        
           };

     

       27
       31
        
       

     

       28
       28
       -
           mixedConf = { ... }: {

     

       32
       32
       +
           mixedConf = {

     

       29
       33
        
             services.adguardhome = {

     

       30
       34
        
               enable = true;

     

       31
       35
        
       

     

       32
       36
        
               mutableSettings = true;

     

       33
       33
       -
               settings = {

     

       34
       34
       -
                 schema_version = 0;

     

       35
       35
       -
                 dns = {

     

       36
       36
       -
                   bind_host = "0.0.0.0";

     

       37
       37
       -
                   bootstrap_dns = "127.0.0.1";

     

       38
       38
       -
                 };

     

       39
       39
       -
               };

     

       37
       37
       +
               settings.dns.bootstrap_dns = [ "127.0.0.1" ];

     

       40
       38
        
             };

     

       41
       39
        
           };

     

       42
       40
        
       

     
···

       70
       68
        
               allowDHCP = true;

     

       71
       69
        
               mutableSettings = false;

     

       72
       70
        
               settings = {

     

       73
       73
       -
                 schema_version = 0;

     

       74
       74
       -
                 dns = {

     

       75
       75
       -
                   bind_host = "0.0.0.0";

     

       76
       76
       -
                   bootstrap_dns = "127.0.0.1";

     

       77
       77
       -
                 };

     

       71
       71
       +
                 dns.bootstrap_dns = [ "127.0.0.1" ];

     

       78
       72
        
                 dhcp = {

     

       79
       73
        
                   # This implicitly enables CAP_NET_RAW

     

       80
       74
        
                   enabled = true;

     
···

       104
       98
        
       

     

       105
       99
        
         testScript = ''

     

       106
       100
        
           with subtest("Minimal (settings = null) config test"):

     

       107
       107
       -
               nullConf.wait_for_unit("adguardhome.service")

     

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

     

       102
       102
       +
             nullConf.wait_for_open_port(3000)

     

       108
       103
        
       

     

       109
       104
        
           with subtest("Default config test"):

     

       110
       110
       -
               emptyConf.wait_for_unit("adguardhome.service")

     

       111
       111
       -
               emptyConf.wait_for_open_port(3000)

     

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

     

       106
       106
       +
             emptyConf.wait_for_open_port(3000)

     

       107
       107
       +
       

     

       108
       108
       +
           with subtest("Default schema_version 23 config test"):

     

       109
       109
       +
             schemaVersionBefore23.wait_for_unit("adguardhome.service")

     

       110
       110
       +
             schemaVersionBefore23.wait_for_open_port(3000)

     

       112
       111
        
       

     

       113
       112
        
           with subtest("Declarative config test, DNS will be reachable"):

     

       114
       114
       -
               declarativeConf.wait_for_unit("adguardhome.service")

     

       115
       115
       -
               declarativeConf.wait_for_open_port(53)

     

       116
       116
       -
               declarativeConf.wait_for_open_port(3000)

     

       113
       113
       +
             declarativeConf.wait_for_unit("adguardhome.service")

     

       114
       114
       +
             declarativeConf.wait_for_open_port(53)

     

       115
       115
       +
             declarativeConf.wait_for_open_port(3000)

     

       117
       116
        
       

     

       118
       117
        
           with subtest("Mixed config test, check whether merging works"):

     

       119
       119
       -
               mixedConf.wait_for_unit("adguardhome.service")

     

       120
       120
       -
               mixedConf.wait_for_open_port(53)

     

       121
       121
       -
               mixedConf.wait_for_open_port(3000)

     

       122
       122
       -
               # Test whether merging works properly, even if nothing is changed

     

       123
       123
       -
               mixedConf.systemctl("restart adguardhome.service")

     

       124
       124
       -
               mixedConf.wait_for_unit("adguardhome.service")

     

       125
       125
       -
               mixedConf.wait_for_open_port(3000)

     

       118
       118
       +
             mixedConf.wait_for_unit("adguardhome.service")

     

       119
       119
       +
             mixedConf.wait_for_open_port(53)

     

       120
       120
       +
             mixedConf.wait_for_open_port(3000)

     

       121
       121
       +
             # Test whether merging works properly, even if nothing is changed

     

       122
       122
       +
             mixedConf.systemctl("restart adguardhome.service")

     

       123
       123
       +
             mixedConf.wait_for_unit("adguardhome.service")

     

       124
       124
       +
             mixedConf.wait_for_open_port(3000)

     

       126
       125
        
       

     

       127
       126
        
           with subtest("Testing successful DHCP start"):

     

       128
       128
       -
               dhcpConf.wait_for_unit("adguardhome.service")

     

       129
       129
       -
               client.systemctl("start network-online.target")

     

       130
       130
       -
               client.wait_for_unit("network-online.target")

     

       131
       131
       -
               # Test IP assignment via DHCP

     

       132
       132
       -
               dhcpConf.wait_until_succeeds("ping -c 5 10.0.10.100")

     

       133
       133
       -
               # Test hostname resolution over DHCP-provided DNS

     

       134
       134
       -
               dhcpConf.wait_until_succeeds("ping -c 5 client.lan")

     

       127
       127
       +
             dhcpConf.wait_for_unit("adguardhome.service")

     

       128
       128
       +
             client.systemctl("start network-online.target")

     

       129
       129
       +
             client.wait_for_unit("network-online.target")

     

       130
       130
       +
             # Test IP assignment via DHCP

     

       131
       131
       +
             dhcpConf.wait_until_succeeds("ping -c 5 10.0.10.100")

     

       132
       132
       +
             # Test hostname resolution over DHCP-provided DNS

     

       133
       133
       +
             dhcpConf.wait_until_succeeds("ping -c 5 client.lan")

     

       135
       134
        
         '';

     

       136
       135
        
       }