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 diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index c25276aa424e..6bc88ec82fa2 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -10,10 +10,7 @@ services.httpd.enable = true; services.httpd.adminAddr = "foo@bar.com"; services.httpd.extraSubservices = [ - { serviceType = "tomcat-connector"; - stateDir = "/var/run/httpd"; - logDir = "/var/log/httpd"; - } + { serviceType = "tomcat-connector"; } ]; };