ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Fix evaluation error in the tomcat test

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-29 01:26:51 +01:00
parent 738a6c173a
commit 98ae32286f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
View File

@ -38,7 +38,7 @@ in
JkWorkersFile ${workersProperties} JkWorkersFile ${workersProperties}
# Where to put jk logs # Where to put jk logs
JkLogFile ${config.logDir}/mod_jk.log JkLogFile ${serverInfo.serverConfig.logDir}/mod_jk.log
# Set the jk log level [debug/error/info] # Set the jk log level [debug/error/info]
JkLogLevel info JkLogLevel info
@ -69,7 +69,7 @@ JkMount /__application__/* loadbalancer
# for load balancing to work properly # for load balancing to work properly
# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to # Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452
JkShmFile ${config.stateDir}/jk.shm JkShmFile ${serverInfo.serverConfig.stateDir}/jk.shm
# Static files in all Tomcat webapp context directories are served by apache # Static files in all Tomcat webapp context directories are served by apache
JkAutoAlias /var/tomcat/webapps JkAutoAlias /var/tomcat/webapps

5
nixos/tests/tomcat.nix
View File

@ -10,10 +10,7 @@
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "foo@bar.com"; services.httpd.adminAddr = "foo@bar.com";
services.httpd.extraSubservices = [ services.httpd.extraSubservices = [
{ serviceType = "tomcat-connector"; { serviceType = "tomcat-connector"; }
stateDir = "/var/run/httpd";
logDir = "/var/log/httpd";
}
]; ];
}; };