refactor(debian): centralise between osfamily & osfinger map files

saltstack-formulas · Feb 18, 2021 · d467166 · d467166
1 parent 4e8016f
commit d467166
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 41 deletions.
diff --git a/tomcat/osfamilymap.yaml b/tomcat/osfamilymap.yaml
@@ -18,8 +18,8 @@ Debian:
   java_home: /usr/lib/jvm/default-java
   catalina_base: /var/lib/tomcat9
   catalina_home: /usr/share/tomcat9
-  catalina_pid: /var/run/tomcat.pid
-  catalina_tmpdir: /var/cache/tomcat/temp
+  catalina_pid: /var/run/tomcat9.pid
+  catalina_tmpdir: /var/cache/tomcat9/temp
 
 RedHat:
   native_pkg: tomcat-native

diff --git a/tomcat/osfingermap.yaml b/tomcat/osfingermap.yaml
@@ -2,19 +2,7 @@
 # vim: ft=yaml
 ---
 # os: Debian
-Debian-10:
-  ver: 9
-  pkg: tomcat9
-  manager_pkg: tomcat9-admin
-  conf_dir: /etc/tomcat9
-  main_config: /etc/default/tomcat9
-  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-10: {}
 Debian-9:
   ver: 8
   pkg: tomcat8
@@ -53,32 +41,8 @@ Debian-7:
   group: tomcat7
 
 # os: Ubuntu
-Ubuntu-20.04:
-  ver: 9
-  pkg: tomcat9
-  manager_pkg: tomcat9-admin
-  conf_dir: /etc/tomcat9
-  main_config: /etc/default/tomcat9
-  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
-Ubuntu-18.04:
-  ver: 9
-  pkg: tomcat9
-  manager_pkg: tomcat9-admin
-  conf_dir: /etc/tomcat9
-  main_config: /etc/default/tomcat9
-  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
+Ubuntu-20.04: {}
+Ubuntu-18.04: {}
 Ubuntu-16.04:
   ver: 8
   pkg: tomcat8