Merge pull request #111 from danny-smit/catalina_variable_handling

Catalina variable handling

Author: myii

test/integration/tomcat_install/controls/yaml_dump_spec.rb

@@ -17,6 +17,10 @@
         service = 'tomcat9'
         user = 'tomcat'
         ver = 9
+        catalina_base = '/var/lib/tomcat9'
+        catalina_home = '/usr/share/tomcat9'
+        catalina_pid = '/var/run/tomcat9.pid'
+        catalina_tmpdir = '/var/cache/tomcat9/temp'
       else
         conf_dir = '/etc/tomcat8'
         group = 'tomcat8'
@@ -26,14 +30,18 @@
         service = 'tomcat8'
         user = 'tomcat8'
         ver = 8
+        catalina_base = '/var/lib/tomcat8'
+        catalina_home = '/usr/share/tomcat8'
+        catalina_pid = '/var/run/tomcat8.pid'
+        catalina_tmpdir = '/var/cache/tomcat8/temp'
       end
       <<~YAML_DUMP.chomp
         arch: amd64
         authbind: 'no'
-        catalina_base: /usr/share/tomcat
-        catalina_home: /usr/share/tomcat
-        catalina_pid: /var/run/tomcat.pid
-        catalina_tmpdir: /var/cache/tomcat/temp
+        catalina_base: #{catalina_base}
+        catalina_home: #{catalina_home}
+        catalina_pid: #{catalina_pid}
+        catalina_tmpdir: #{catalina_tmpdir}
         cluster:
           simple: true
         conf_dir: #{conf_dir}

tomcat/config.sls

@@ -28,6 +28,18 @@ tomcat tomcat_conf:
     - watch_in:
       - service: tomcat package installed and service running
 
+{% if tomcat.catalina_tmpdir|d('') %}
+catalina tmpdir:
+  file.directory:
+    - name: {{ tomcat.catalina_tmpdir }}
+    - user: {{ tomcat.user }}
+    - group: {{ tomcat.group }}
+    - mode: '755'
+    - makedirs: True
+    - require_in:
+      - service: tomcat package installed and service running
+{% endif %}
+
 tomcat 100_server_xml:
   file.accumulated:
     - name: 100_server_xml

tomcat/osfamilymap.yaml

@@ -15,6 +15,10 @@ Debian:
   user: tomcat8
   group: tomcat8
   java_home: /usr/lib/jvm/default-java
+  catalina_base: /var/lib/tomcat8
+  catalina_home: /usr/share/tomcat8
+  catalina_pid: /var/run/tomcat8.pid
+  catalina_tmpdir: /var/cache/tomcat8/temp
 
 RedHat:
   native_pkg: tomcat-native

tomcat/osfingermap.yaml

@@ -11,6 +11,10 @@ Debian-10:
   service: tomcat9
   user: tomcat
   group: tomcat
+  catalina_base: /var/lib/tomcat9
+  catalina_home: /usr/share/tomcat9
+  catalina_pid: /var/run/tomcat9.pid
+  catalina_tmpdir: /var/cache/tomcat9/temp
 Debian-9: {}
 Debian-8: {}
 Debian-7: