feat(osfingermap): add settings for debian-8

saltstack-formulas · Apr 27, 2020 · 7c86d80 · 7c86d80
1 parent 58d65f9
commit 7c86d80
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/test/integration/tomcat_install/controls/yaml_dump_spec.rb b/test/integration/tomcat_install/controls/yaml_dump_spec.rb
@@ -21,6 +21,19 @@
         catalina_home = '/usr/share/tomcat9'
         catalina_pid = '/var/run/tomcat9.pid'
         catalina_tmpdir = '/var/cache/tomcat9/temp'
+      when /^8/
+        conf_dir = '/etc/tomcat7'
+        group = 'tomcat7'
+        main_config = '/etc/default/tomcat7'
+        manager_pkg = 'tomcat7-admin'
+        pkg = 'tomcat7'
+        service = 'tomcat7'
+        user = 'tomcat7'
+        ver = 7
+        catalina_base = '/var/lib/tomcat7'
+        catalina_home = '/usr/share/tomcat7'
+        catalina_pid = '/var/run/tomcat7.pid'
+        catalina_tmpdir = '/var/cache/tomcat7/temp'
       else
         conf_dir = '/etc/tomcat8'
         group = 'tomcat8'

diff --git a/tomcat/osfingermap.yaml b/tomcat/osfingermap.yaml
@@ -16,7 +16,19 @@ Debian-10:
   catalina_pid: /var/run/tomcat9.pid
   catalina_tmpdir: /var/cache/tomcat9/temp
 Debian-9: {}
-Debian-8: {}
+Debian-8:
+  ver: 7
+  pkg: tomcat7
+  manager_pkg: tomcat7-admin
+  conf_dir: /etc/tomcat7
+  main_config: /etc/default/tomcat7
+  service: tomcat7
+  user: tomcat7
+  group: tomcat7
+  catalina_base: /var/lib/tomcat7
+  catalina_home: /usr/share/tomcat7
+  catalina_pid: /var/run/tomcat7.pid
+  catalina_tmpdir: /var/cache/tomcat7/temp
 Debian-7:
   pkg: tomcat7
   manager_pkg: tomcat7-admin