public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: Multiple service instances, apply to nginx. See #6784

Browse Source
This commit is contained in:
Luca Bruno 2015-03-13 14:11:59 +00:00
parent 506cbf05a9
commit 7ef59c4fe2
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/types.nix
View File

@ -227,4 +227,19 @@ rec {
}; };
mkMultiInstance = path: args: f:
let
def = f (args // { name = "default"; config = getAttrFromPath path args.config; });
in {
options = setAttrByPath path (def.options // {
instances = mkOption {
type = types.attrsOf (types.submodule f);
default = {};
description = "Additional instances of this service";
};
});
config = def.config;
};
} }

20
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -1,9 +1,12 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }@args:
with lib; with lib;
let topconfig = config;
in mkMultiInstance [ "services" "nginx" ] args ({ config, name, ... }:
let let
cfg = config.services.nginx; cfg = config;
nginx = cfg.package; nginx = cfg.package;
configFile = pkgs.writeText "nginx.conf" '' configFile = pkgs.writeText "nginx.conf" ''
user ${cfg.user} ${cfg.group}; user ${cfg.user} ${cfg.group};
@ -20,7 +23,6 @@ in
{ {
options = { options = {
services.nginx = {
enable = mkOption { enable = mkOption {
default = false; default = false;
type = types.bool; type = types.bool;
@ -82,15 +84,13 @@ in
description = "Group account under which nginx runs."; description = "Group account under which nginx runs.";
}; };
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
# TODO: test user supplied config file pases syntax test # TODO: test user supplied config file pases syntax test
systemd.services.nginx = { systemd.services."nginx-${name}" = {
description = "Nginx Web Server"; description = "Nginx Web Server - ${name}";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ nginx ]; path = [ nginx ];
@ -111,12 +111,12 @@ in
users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton
{ name = "nginx"; { name = "nginx";
group = cfg.group; group = cfg.group;
uid = config.ids.uids.nginx; uid = topconfig.ids.uids.nginx;
}); });
users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton users.extraGroups = optionalAttrs (cfg.group == "nginx") (singleton
{ name = "nginx"; { name = "nginx";
gid = config.ids.gids.nginx; gid = topconfig.ids.gids.nginx;
}); });
}; };
} })