cluster/lib/service-module.nix

@@ -23,12 +23,12 @@ in
           * X evaluators, Y smallBuilders, Z bigBuilders
         etc.
       '';
-      type = with types; lazyAttrsOf (oneOf [ str (listOf str) ]);
+      type = with types; attrsOf (oneOf [ str (listOf str) ]);
       default = [];
     };
     otherNodes = mkOption {
       description = "Other nodes in the group.";
-      type = with types; lazyAttrsOf (functionTo (listOf str));
+      type = with types; attrsOf (functionTo (listOf str));
       default = [];
     };
     nixos = mkOption {

cluster/services/storage/default.nix

@@ -11,7 +11,6 @@ in
 
   services.storage = {
     nodes = {
-      internal = lib.subtractLists config.services.storage.nodes.external (lib.attrNames depot.gods.fromLight);
       external = [ "prophet" ];
       heresy = [ "VEGAS" ];
       garage = [ "grail" "prophet" "VEGAS" ];
@@ -20,9 +19,6 @@ in
       garageExternal = [ "grail" "prophet" ];
     };
     nixos = {
-      internal = [
-        ./internal.nix
-      ];
       external = [
         ./external.nix
         ./s3ql-upgrades.nix

cluster/services/storage/internal.nix

@@ -1,12 +0,0 @@
-{ ... }:
-
-let
-  storageDir = "/srv/storage";
-in
-
-{
-  systemd.tmpfiles.settings."00-storage" = {
-    "${storageDir}".d.mode = "0755";
-    "${storageDir}/private".d.mode = "0751";
-  };
-}