summary refs log tree commit diff
path: root/nixos/modules/services/web-servers
diff options
context:
space:
mode:
authorPavel Goran <me@pvgoran.name>2018-08-02 22:46:00 +0700
committerPavel Goran <me@pvgoran.name>2018-08-02 23:37:09 +0700
commit7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808 (patch)
tree224f505b114ac9165dbde287a66a2d555e655461 /nixos/modules/services/web-servers
parent65c43b44684506b629fd4effeeca59412344eea6 (diff)
downloadnixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.tar
nixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.tar.gz
nixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.tar.bz2
nixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.tar.lz
nixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.tar.xz
nixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.tar.zst
nixlib-7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808.zip
nixos/tomcat: correct type specification for virtualHosts
The wrong specification was introduced as part of commit 472f16d.

Fixes #44361.
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index d8ccb7ca65d6..3a552f7a7502 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -118,8 +118,15 @@ in
         type = types.listOf (types.submodule {
           options = {
             name = mkOption {
-              type = types.listOf types.str;
+              type = types.str;
               description = "name of the virtualhost";
+            };
+            webapps = mkOption {
+              type = types.listOf types.path;
+              description = ''
+                List containing web application WAR files and/or directories containing
+                web applications and configuration files for the virtual host.
+              '';
               default = [];
             };
           };