diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-02 23:32:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 23:32:09 +0200 |
commit | 6b20531d7a55dfe7fc50fad049006c3d731b83dd (patch) | |
tree | 8dfd9505b3e36c3872e0c5fb2c351aa498fe320c /nixos/modules | |
parent | b32d0a41d028d1f0483c435303d4e5e2e9113e61 (diff) | |
parent | 7fb40c6503fb9dc3fd1042d2883ab20bf7e2c808 (diff) | |
download | nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.tar nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.tar.gz nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.tar.bz2 nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.tar.lz nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.tar.xz nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.tar.zst nixlib-6b20531d7a55dfe7fc50fad049006c3d731b83dd.zip |
Merge pull request #44365 from pvgoran/tomcat-correct-virtualHosts
nixos/tomcat: correct type specification for virtualHosts
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/web-servers/tomcat.nix | 9 |
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 = []; }; }; |