From 0d356995078def727eb5a209df488faae801383a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 10 Aug 2009 18:45:18 +0000
Subject: [PATCH] Implemented virtual host support. Now it's possible to assign
 web applications to virtual host, for example:

{
  ...

  services = {
    tomcat = {
      enable = true;
      virtualHosts = [
        { name = "test1.localhost";
          webapps = [ mypkgs.HelloApp ];
        }
        { name = "test2.localhost";
          webapps = [ mypkgs.ByeApp ];
        }
      ];
    };
  };
}


svn path=/nixos/trunk/; revision=16654
---
 modules/services/web-servers/tomcat.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 4c37449983a..c473e7aa38f 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -122,7 +122,7 @@ mkIf config.services.tomcat.enable {
 	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
 	    
 	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
-	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties server.xml)
+	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml)
 	    do
 	        ln -sf ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
 	    done