diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2022-03-13 21:43:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-13 21:43:45 +0100 |
| commit | 43543a6bbcb733d6ae399d083f43aff6ee447627 (patch) | |
| tree | 6ce56d7e935bc105a7a4923f39a5f82cc123b507 /nixos/modules | |
| parent | 213e3db879892e3b6303ca88c8cff5e1d7ddd942 (diff) | |
| parent | 86fafe5f5026651ae5139f4880f177b350c8ec83 (diff) | |
| download | nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.tar nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.tar.gz nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.tar.bz2 nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.tar.lz nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.tar.xz nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.tar.zst nixpkgs-43543a6bbcb733d6ae399d083f43aff6ee447627.zip | |
Merge pull request #163716 from svanderburg/fixtomcat
nixos/tomcat: configure default group and fix broken default package …
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-servers/tomcat.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index f9446fe125a..877097cf378 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -23,8 +23,8 @@ in package = mkOption { type = types.package; - default = pkgs.tomcat85; - defaultText = literalExpression "pkgs.tomcat85"; + default = pkgs.tomcat9; + defaultText = literalExpression "pkgs.tomcat9"; example = lib.literalExpression "pkgs.tomcat9"; description = '' Which tomcat package to use. @@ -127,7 +127,7 @@ in webapps = mkOption { type = types.listOf types.path; default = [ tomcat.webapps ]; - defaultText = literalExpression "[ pkgs.tomcat85.webapps ]"; + defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -201,6 +201,7 @@ in { uid = config.ids.uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; + group = "tomcat"; extraGroups = cfg.extraGroups; }; |