.renovaterc.json

@@ -24,10 +24,20 @@
     "fileMatch": [
       "(^|/)flake\\.nix$"
     ],
-    "commitMessageTopic": "flake inputs",
+    "commitMessageTopic": "nixpkgs",
     "commitMessageExtra": "to {{newValue}}",
     "enabled": true
   },
+  "lockFileMaintenance": {
+    "enabled": true,
+    "recreateWhen": "always",
+    "rebaseStalePrs": true,
+    "branchTopic": "lock-file-maintenance",
+    "commitMessageAction": "Lock file maintenance",
+    "schedule": [
+      "* 0-1 * * *"
+    ]
+  },
   "automergeSchedule": [
     "* 0-1 * * *"
   ]

flake-modules/tests.nix

@@ -6,6 +6,7 @@
       checks =
         let
           testDomain = "webnstest.example";
+
           zoneFile = pkgs.writeText "${testDomain}.zoneinfo" ''
             $ORIGIN .
             $TTL 60 ; 1 minute
@@ -26,7 +27,7 @@
             nsupdate                  IN  AAAA  ::1
           '';
 
-          webnsupdate-machine =
+          bindDynamicZone =
             { config, ... }:
             let
               bindCfg = config.services.bind;
@@ -34,7 +35,30 @@
               dynamicZonesDir = "${bindData}/zones";
             in
             {
-              imports = [ self.nixosModules.webnsupdate ];
+              services.bind.zones.${testDomain} = {
+                master = true;
+                file = "${dynamicZonesDir}/${testDomain}";
+                extraConfig = ''
+                  allow-update { key rndc-key; };
+                '';
+              };
+
+              systemd.services.bind.preStart = ''
+                # shellcheck disable=SC2211,SC1127
+                rm -f ${dynamicZonesDir}/* # reset dynamic zones
+
+                # create a dynamic zones dir
+                mkdir -m 0755 -p ${dynamicZonesDir}
+                # copy dynamic zone's file to the dynamic zones dir
+                cp ${zoneFile} ${dynamicZonesDir}/${testDomain}
+              '';
+            };
+
+          webnsupdate-machine = {
+            imports = [
+              bindDynamicZone
+              self.nixosModules.webnsupdate
+            ];
 
             config = {
               environment.systemPackages = [
@@ -43,6 +67,8 @@
               ];
 
               services = {
+                bind.enable = true;
+
                 webnsupdate = {
                   enable = true;
                   bindIp = "127.0.0.1";
@@ -60,31 +86,9 @@
                     test3.${testDomain}.
                   '';
                 };
-
-                  bind = {
-                    enable = true;
-                    zones.${testDomain} = {
-                      master = true;
-                      file = "${dynamicZonesDir}/${testDomain}";
-                      extraConfig = ''
-                        allow-update { key rndc-key; };
-                      '';
               };
             };
           };
-
-                systemd.services.bind.preStart = ''
-                  # shellcheck disable=SC2211,SC1127
-                  rm -f ${dynamicZonesDir}/* # reset dynamic zones
-
-                  mkdir -m 0755 -p ${dynamicZonesDir}
-                  chown named ${dynamicZonesDir}
-
-                  # copy dynamic zone's file to the dynamic zones dir
-                  cp ${zoneFile} ${dynamicZonesDir}/${testDomain}
-                '';
-              };
-            };
         in
         {
           module-test = pkgs.testers.runNixOSTest {