From 7c86d801ef492dc210ad8dc396502d9b60e0129b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 26 Apr 2020 09:53:44 +0100
Subject: [PATCH] feat(osfingermap): add settings for `debian-8`
---
.../tomcat_install/controls/yaml_dump_spec.rb | 13 +++++++++++++
tomcat/osfingermap.yaml | 14 +++++++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/test/integration/tomcat_install/controls/yaml_dump_spec.rb b/test/integration/tomcat_install/controls/yaml_dump_spec.rb
index aeba17d..d2e65f1 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 e2ed9fc..b741050 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
--
GitLab