From 51f2968ed0014079d392b52fc613e181bce3501f Mon Sep 17 00:00:00 2001 From: Imran Iqbal <iqbalmy@hotmail.com> Date: Sat, 25 Apr 2020 09:23:08 +0100 Subject: [PATCH] fix(cluster): set accumlator name --- tomcat/cluster.sls | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tomcat/cluster.sls b/tomcat/cluster.sls index 7c3681b..1b2fc34 100644 --- a/tomcat/cluster.sls +++ b/tomcat/cluster.sls @@ -3,8 +3,17 @@ include: - tomcat.config +{#- TODO: Upon fixing `name` below, this section is only working for Tomcat 7. + The `server.xml` template needs adapting for later versions. + Refer back to the following resources: + * http://tomcat.apache.org/tomcat-7.0-doc/cluster-howto.html + * http://tomcat.apache.org/tomcat-8.0-doc/cluster-howto.html + * http://tomcat.apache.org/tomcat-9.0-doc/cluster-howto.html +#} +{%- if tomcat.ver == 7 %} tomcat 600_server_xml: file.accumulated: + - name: 600_server_xml - filename: {{ tomcat.conf_dir }}/server.xml {% if tomcat.cluster is defined %} - text: {{ tomcat.cluster }} @@ -12,3 +21,4 @@ tomcat 600_server_xml: - require_in: - file: tomcat server_xml - unless: test "`uname`" = "Darwin" +{%- endif %} -- GitLab