Merge pull request #69 from Melkor333/master

Fix letsencrypt tests, user type definition and getSubmodules function
nixcloud · Sep 22, 2020 · 05701ee · 05701ee
2 parents 3a0767f + fea08a7
commit 05701ee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/modules/services/TLS/test.nix b/modules/services/TLS/test.nix
@@ -3,13 +3,13 @@
 with pkgs.lib;
 
 let
-  commonConfig = <nixpkgs/nixos/tests/common/letsencrypt/common.nix>;
-  snakeoil-certs = import (<nixpkgs/nixos/tests/common/letsencrypt/snakeoil-certs.nix>);
+  commonConfig = <nixpkgs/nixos/tests/common/acme/client>;
+  snakeoil-certs = import (<nixpkgs/nixos/tests/common/acme/server/snakeoil-certs.nix>);
 in rec {
   name = "nixcloud.TLS";
 
   nodes = rec {
-    letsencrypt =  <nixpkgs/nixos/tests/common/letsencrypt>;
+    acme =  <nixpkgs/nixos/tests/common/acme/server>;
 
     webserver = { config, pkgs, nodes, ... }: {
       imports = [ commonConfig ];
@@ -258,12 +258,12 @@ in rec {
   };
 
   testScript = ''
-    $letsencrypt->waitForUnit("default.target");
+    $acme->waitForUnit("default.target");
     $webserver->waitForUnit("default.target");
     $client->waitForUnit("default.target");
 
 
-    $letsencrypt->waitForUnit("multi-user.target");
+    $acme->waitForUnit("multi-user.target");
 
     # if the nixcloud.reverse-proxy doesn't make it, we don't need to go on
     $webserver->waitForUnit("nixcloud.reverse-proxy.service");

diff --git a/modules/services/reverse-proxy/test.nix b/modules/services/reverse-proxy/test.nix
@@ -227,10 +227,11 @@ in
 
     services.httpd = {
       enable = true;
-      listen = [{
-        port = 60000;
-        ip = "*";
-      }];
+      virtualHosts = {
+        "example.com" = {
+          listen = [{port = 60000; ip = "*";}];
+        };
+      };
       adminAddr="[email protected]";
     };
 

diff --git a/modules/web/core/base.nix b/modules/web/core/base.nix
@@ -15,9 +15,7 @@ let
     optionNames = lib.attrNames (lib.filterAttrs (lib.const isUnit) reEval);
   in lib.genAttrs optionNames (name: toplevel.options.systemd.${name});
 
-  getSubModules = opt: let
-    subModules = opt.type.getSubModules;
-  in map (m: m.submodule) subModules;
+  getSubModules = opt: opt.type.functor.wrapped.functor.payload.modules;
 
   availableInstanceDependencies = [
     "after" "before" "bindsTo" "conflicts" "partOf" "requiredBy" "requires"

diff --git a/modules/web/core/webserver.nix b/modules/web/core/webserver.nix
@@ -61,9 +61,7 @@ in {
 
     webserver.userOptions = lib.mkOption {
       default = {};
-      type = let
-        submodules = toplevel.options.users.users.type.getSubModules;
-      in lib.types.submodule (map (m: m.submodule) submodules);
+      type = lib.types.submodule toplevel.options.users.users.type.functor.wrapped.getSubModules;
       description = ''
         Additional options for the user, see <option>users.users</option> for
         possible values.
@@ -78,9 +76,7 @@ in {
 
     webserver.groupOptions = lib.mkOption {
       default = {};
-      type = let
-        submodules = toplevel.options.users.groups.type.getSubModules;
-      in lib.types.submodule (map (m: m.submodule) submodules);
+      type = lib.types.submodule toplevel.options.users.groups.type.functor.wrapped.getSubModules;
       description = ''
         Additional options for the group, see <option>users.groups</option> for
         possible values.
@@ -114,15 +110,15 @@ in {
         }
       ];
 
+      users.${config.webserver.user} = lib.mkMerge [
+        (lib.mkForce { inherit (config.webserver) name group; })
+        (lib.modules.mkAliasAndWrapDefsWithPriority lib.id config.webserver.userOptions)
+      ];
 
-
-
-      users.${config.webserver.user} = {
-        inherit (config.webserver) group;
-      } // removeAttrs config.webserver.userOptions [ "name" "group" ];
-
-      groups.${config.webserver.group} =
-        removeAttrs config.webserver.groupOptions [ "name" ];
+      groups.${config.webserver.group} = lib.mkMerge [
+        (lib.mkForce { inherit (config.webserver) name; })
+        (lib.modules.mkAliasAndWrapDefsWithPriority lib.id config.webserver.groupOptions)
+      ];
     })
     (lib.mkIf (config.enable && needsWebServerInit) {
       systemd.services.webserver-init = {