diff options
| -rw-r--r-- | nixos/modules/services/web-servers/tomcat.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index c3be20b41e29..c1166b697681 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -74,8 +74,8 @@ in webapps = mkOption { type = types.listOf types.package; - default = [ tomcat ]; - defaultText = "[ tomcat ]"; + default = [ tomcat.webapps ]; + defaultText = "[ tomcat.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 3653679aa012..70d39e7216e8 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -11,10 +11,13 @@ let inherit sha256; }; + outputs = [ "out" "webapps" ]; installPhase = '' mkdir $out mv * $out + mkdir -p $webapps/webapps + mv $out/webapps $webapps/ ''; meta = { |