movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Added support for custom context.xml

Browse source 
svn path=/nixos/trunk/; revision=12513
This commit is contained in:
Sander van der Burg 2008-08-06 15:07:29 +00:00
parent afdfff7ed8
commit f652a0836a
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
system/options.nix
View file

@ -1467,12 +1467,17 @@
sharedLibFrom = mkOption { sharedLibFrom = mkOption {
default = ""; default = "";
description ="Location where shared libraries are stored. Leave empty to use the baseDir."; description = "Location where shared libraries are stored. Leave empty to use the baseDir.";
}; };
commonLibFrom = mkOption { commonLibFrom = mkOption {
default = ""; default = "";
description ="Location where common libraries are stored. Leave empty to use the baseDir."; description = "Location where common libraries are stored. Leave empty to use the baseDir.";
};
contextXML = mkOption {
default = "";
description = "Location of the context.xml to use. Leave empty to use the default.";
}; };
}; };

9
upstart-jobs/tomcat.nix
View file

@ -38,6 +38,15 @@ in
cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir} cp -av ${pkgs.tomcat6}/{conf,temp,logs} ${cfg.baseDir}
fi fi
# Deploy context.xml
if test "${cfg.contextXML}" = ""
then
cp ${pkgs.tomcat6}/conf/context.xml.default ${cfg.baseDir}/conf/context.xml
else
cp ${cfg.contextXML} ${cfg.baseDir}/conf/context.xml
fi
# Deploy all webapplications # Deploy all webapplications
if ! test "${cfg.deployFrom}" = "" if ! test "${cfg.deployFrom}" = ""