Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit05701ee

Browse files
authored
Merge pull request#69 from Melkor333/master
Fix letsencrypt tests, user type definition and getSubmodules function
2 parents3a0767f +fea08a7 commit05701ee

File tree

4 files changed

+21
-26
lines changed

4 files changed

+21
-26
lines changed

‎modules/services/TLS/test.nix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
withpkgs.lib;
44

55
let
6-
commonConfig=<nixpkgs/nixos/tests/common/letsencrypt/common.nix>;
7-
snakeoil-certs=import(<nixpkgs/nixos/tests/common/letsencrypt/snakeoil-certs.nix>);
6+
commonConfig=<nixpkgs/nixos/tests/common/acme/client>;
7+
snakeoil-certs=import(<nixpkgs/nixos/tests/common/acme/server/snakeoil-certs.nix>);
88
inrec{
99
name="nixcloud.TLS";
1010

1111
nodes=rec{
12-
letsencrypt=<nixpkgs/nixos/tests/common/letsencrypt>;
12+
acme=<nixpkgs/nixos/tests/common/acme/server>;
1313

1414
webserver={config,pkgs,nodes, ...}:{
1515
imports=[commonConfig];
@@ -258,12 +258,12 @@ in rec {
258258
};
259259

260260
testScript=''
261-
$letsencrypt->waitForUnit("default.target");
261+
$acme->waitForUnit("default.target");
262262
$webserver->waitForUnit("default.target");
263263
$client->waitForUnit("default.target");
264264
265265
266-
$letsencrypt->waitForUnit("multi-user.target");
266+
$acme->waitForUnit("multi-user.target");
267267
268268
# if the nixcloud.reverse-proxy doesn't make it, we don't need to go on
269269
$webserver->waitForUnit("nixcloud.reverse-proxy.service");

‎modules/services/reverse-proxy/test.nix‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,11 @@ in
227227

228228
services.httpd={
229229
enable=true;
230-
listen=[{
231-
port=60000;
232-
ip="*";
233-
}];
230+
virtualHosts={
231+
"example.com"={
232+
listen=[{port=60000;ip="*";}];
233+
};
234+
};
234235
adminAddr="example@example.com";
235236
};
236237

‎modules/web/core/base.nix‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ let
1515
optionNames=lib.attrNames(lib.filterAttrs(lib.constisUnit)reEval);
1616
inlib.genAttrsoptionNames(name:toplevel.options.systemd.${name});
1717

18-
getSubModules=opt:let
19-
subModules=opt.type.getSubModules;
20-
inmap(m:m.submodule)subModules;
18+
getSubModules=opt:opt.type.functor.wrapped.functor.payload.modules;
2119

2220
availableInstanceDependencies=[
2321
"after""before""bindsTo""conflicts""partOf""requiredBy""requires"

‎modules/web/core/webserver.nix‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ in {
6161

6262
webserver.userOptions=lib.mkOption{
6363
default={};
64-
type=let
65-
submodules=toplevel.options.users.users.type.getSubModules;
66-
inlib.types.submodule(map(m:m.submodule)submodules);
64+
type=lib.types.submoduletoplevel.options.users.users.type.functor.wrapped.getSubModules;
6765
description=''
6866
Additional options for the user, see <option>users.users</option> for
6967
possible values.
@@ -78,9 +76,7 @@ in {
7876

7977
webserver.groupOptions=lib.mkOption{
8078
default={};
81-
type=let
82-
submodules=toplevel.options.users.groups.type.getSubModules;
83-
inlib.types.submodule(map(m:m.submodule)submodules);
79+
type=lib.types.submoduletoplevel.options.users.groups.type.functor.wrapped.getSubModules;
8480
description=''
8581
Additional options for the group, see <option>users.groups</option> for
8682
possible values.
@@ -114,15 +110,15 @@ in {
114110
}
115111
];
116112

113+
users.${config.webserver.user}=lib.mkMerge[
114+
(lib.mkForce{inherit(config.webserver)namegroup;})
115+
(lib.modules.mkAliasAndWrapDefsWithPrioritylib.idconfig.webserver.userOptions)
116+
];
117117

118-
119-
120-
users.${config.webserver.user}={
121-
inherit(config.webserver)group;
122-
}//removeAttrsconfig.webserver.userOptions["name""group"];
123-
124-
groups.${config.webserver.group}=
125-
removeAttrsconfig.webserver.groupOptions["name"];
118+
groups.${config.webserver.group}=lib.mkMerge[
119+
(lib.mkForce{inherit(config.webserver)name;})
120+
(lib.modules.mkAliasAndWrapDefsWithPrioritylib.idconfig.webserver.groupOptions)
121+
];
126122
})
127123
(lib.mkIf(config.enable&&needsWebServerInit){
128124
systemd.services.webserver-init={

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp