Merge remote-tracking branch 'cd/master'
This commit is contained in:
commit
bb2c33cf30
@ -24,9 +24,9 @@ let
|
|||||||
"${config.networking.hostName}.retiolum"
|
"${config.networking.hostName}.retiolum"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
port = mkOption {
|
listen = mkOption {
|
||||||
type = with types; int;
|
type = with types; str;
|
||||||
default = 80;
|
default = "80";
|
||||||
};
|
};
|
||||||
locations = mkOption {
|
locations = mkOption {
|
||||||
type = with types; listOf (attrsOf str);
|
type = with types; listOf (attrsOf str);
|
||||||
@ -68,9 +68,9 @@ let
|
|||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
to-server = { server-names, port, locations, extraConfig, ... }: ''
|
to-server = { server-names, listen, locations, extraConfig, ... }: ''
|
||||||
server {
|
server {
|
||||||
listen ${toString port};
|
listen ${listen};
|
||||||
server_name ${toString server-names};
|
server_name ${toString server-names};
|
||||||
${extraConfig}
|
${extraConfig}
|
||||||
${indent (concatStrings (map to-location locations))}
|
${indent (concatStrings (map to-location locations))}
|
||||||
|
Loading…
Reference in New Issue
Block a user