summary refs log tree commit diff
path: root/nixos/modules/services/web-servers
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-29 01:26:51 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-29 01:26:51 +0100
commit98ae32286f91f25005949c3977e52f06d5894645 (patch)
tree20732305bfe529e2970048c5503831d3e85b95f5 /nixos/modules/services/web-servers
parent738a6c173a3e1d92d589f5c32ecf793a1c115918 (diff)
downloadnixlib-98ae32286f91f25005949c3977e52f06d5894645.tar
nixlib-98ae32286f91f25005949c3977e52f06d5894645.tar.gz
nixlib-98ae32286f91f25005949c3977e52f06d5894645.tar.bz2
nixlib-98ae32286f91f25005949c3977e52f06d5894645.tar.lz
nixlib-98ae32286f91f25005949c3977e52f06d5894645.tar.xz
nixlib-98ae32286f91f25005949c3977e52f06d5894645.tar.zst
nixlib-98ae32286f91f25005949c3977e52f06d5894645.zip
Fix evaluation error in the tomcat test
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index f12ae842b587..1b754cf025eb 100644
--- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
@@ -38,7 +38,7 @@ in
 JkWorkersFile ${workersProperties}
 
 # 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]
 JkLogLevel info
@@ -69,7 +69,7 @@ JkMount /__application__/* loadbalancer
 # for load balancing to work properly
 # Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to
 # 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
 JkAutoAlias /var/tomcat/webapps