chore(version): try tomcat9 on ubuntu/debian

saltstack-formulas · Nov 26, 2020 · a3d9cf3 · a3d9cf3
1 parent bd396a6
commit a3d9cf3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/pillar.example b/pillar.example
@@ -3,7 +3,7 @@
 ---
 tomcat:
   # The Tomcat version can be overridden like so.
-  # ver: 7
+  # ver: 9
   security: 'no'
   # The Java home directory can be overridden like so.
   # java_home: '/usr/lib/jvm/default-java'

diff --git a/tomcat/clean.sls b/tomcat/clean.sls
@@ -6,11 +6,20 @@ tomcat stop services and clean packages:
       - {{ tomcat.service }}
       - haveged
     - unless: {{ grains.os == 'MacOS' and tomcat.ver|int < 9 }}   ####no macOS plist file for tomcat9
-  file.absent:
-    - names:
-      - /usr/local/opt/tomcat
-  pkg.removed:
+  pkg.purged:
     - names:
+      - {{ tomcat.manager_pkg }}
       - {{ tomcat.native_pkg }}
+      - {{ tomcat.common_pkg }}
+      - libtomcat{{ tomcat.ver }}
+      - libtomcat{{ tomcat.ver }}-java
       - {{ tomcat.pkg }}
       - haveged
+  file.absent:
+    - names:
+      - /usr/local/opt/tomcat
+      - /usr/local/opt/tomcat{{ tomcat.ver }}
+      - /usr/local/opt/tomcat{{ tomcat.ver }}-admin
+      - /usr/local/opt/tomcat{{ tomcat.ver }}-common
+      - /usr/share/tomcat
+      - /usr/share/tomcat{{ tomcat.ver }}
diff --git a/tomcat/defaults.yaml b/tomcat/defaults.yaml
@@ -3,6 +3,8 @@
 ---
 tomcat:
   pkg: tomcat
+  manager_pkg: tomcat-admin
+  common_pkg: tomcat-common
   ver: 7
   with_haveged: false
   haveged_enabled: false

diff --git a/tomcat/osfamilymap.yaml b/tomcat/osfamilymap.yaml
@@ -2,23 +2,24 @@
 # vim: ft=yaml
 ---
 Debian:
-  ver: 8
-  pkg: tomcat8
+  ver: 9
+  pkg: tomcat9
   native_pkg: libtcnative-1
-  manager_pkg: tomcat8-admin
+  manager_pkg: tomcat9-admin
+  common_pkg: tomcat9-common
   with_haveged: true
   haveged_enabled: true
-  conf_dir: /etc/tomcat8
-  main_config: /etc/default/tomcat8
+  conf_dir: /etc/tomcat9
+  main_config: /etc/default/tomcat9
   main_config_template: salt://tomcat/files/tomcat-default-Debian.template
-  service: tomcat8
-  user: tomcat8
-  group: tomcat8
+  service: tomcat9
+  user: tomcat
+  group: tomcat
   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
+  catalina_base: /var/lib/tomcat9
+  catalina_home: /usr/share/tomcat9
+  catalina_pid: /var/run/tomcat.pid
+  catalina_tmpdir: /var/cache/tomcat/temp
 
 RedHat:
   native_pkg: tomcat-native