diff --git a/test/integration/tomcat_install/controls/yaml_dump_spec.rb b/test/integration/tomcat_install/controls/yaml_dump_spec.rb index aeba17d4bdb4988048aad1db020ccdaba4283cbf..d2e65f151ab78892db073db16b1fbe6302e37a48 100644 --- a/test/integration/tomcat_install/controls/yaml_dump_spec.rb +++ b/test/integration/tomcat_install/controls/yaml_dump_spec.rb @@ -21,6 +21,19 @@ control 'Tomcat `map.jinja` YAML dump' do 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 index e2ed9fcda94fcbfe616d8a5d0edf7e05d10f50a2..b741050c2a9562b2e5489b49a17f3188a04fcaa4 100644 --- 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