public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added deploydir to tomcat service

Browse Source 
svn path=/nixos/trunk/; revision=10407
This commit is contained in:
Sander van der Burg 2008-01-30 14:38:27 +00:00
parent 92fffa1ee8
commit 406d3aafc5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
system/options.nix
View File

@ -1050,6 +1050,11 @@
default = "nobody"; default = "nobody";
description = "User account under which Apache Tomcat runs."; description = "User account under which Apache Tomcat runs.";
}; };
deployFrom = mkOption {
default = "";
description = "Location where webapplications are stored. Leave empty to use the baseDir.";
};
}; };
httpd = { httpd = {

2
upstart-jobs/tomcat.nix
View File

@ -5,7 +5,7 @@ let
cfg = config.services.tomcat; cfg = config.services.tomcat;
tomcatService = import ../services/tomcat { tomcatService = import ../services/tomcat {
inherit (pkgs) stdenv jdk tomcat6 su; inherit (pkgs) stdenv jdk tomcat6 su;
inherit (cfg) baseDir user; inherit (cfg) baseDir user deployFrom;
}; };
in in