summary refs log tree commit diff
path: root/nixos/modules/services/web-servers
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2018-08-02 23:32:33 +0200
committerGitHub <noreply@github.com>2018-08-02 23:32:33 +0200
commit150f4fe9c47dd8763214c0db721bba0da532275a (patch)
treea964016d1172c4d2c14c4005cce9b215c1b611c4 /nixos/modules/services/web-servers
parent6b20531d7a55dfe7fc50fad049006c3d731b83dd (diff)
parentb2b5b9746893754c1d8fe0bbf59123967b9c23c1 (diff)
downloadnixlib-150f4fe9c47dd8763214c0db721bba0da532275a.tar
nixlib-150f4fe9c47dd8763214c0db721bba0da532275a.tar.gz
nixlib-150f4fe9c47dd8763214c0db721bba0da532275a.tar.bz2
nixlib-150f4fe9c47dd8763214c0db721bba0da532275a.tar.lz
nixlib-150f4fe9c47dd8763214c0db721bba0da532275a.tar.xz
nixlib-150f4fe9c47dd8763214c0db721bba0da532275a.tar.zst
nixlib-150f4fe9c47dd8763214c0db721bba0da532275a.zip
Merge pull request #44371 from pvgoran/tomcat-webapps-listOfPaths
nixos/tomcat: allow non-package paths in services.tomcat.webapps
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 3a552f7a7502..d92ba72a8336 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -108,7 +108,7 @@ in
       };
 
       webapps = mkOption {
-        type = types.listOf types.package;
+        type = types.listOf types.path;
         default = [ tomcat.webapps ];
         defaultText = "[ pkgs.tomcat85.webapps ]";
         description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";