From ba9cbf12f79702b18eb0b5c95b62f219281f44fc Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 23 Apr 2020 06:46:34 +0100
Subject: [PATCH] fix(fedora): use `ver: 9` (Jasper Listener deprecated in
tomcat >= 8)
---
.../integration/tomcat_install/controls/yaml_dump_spec.rb | 8 +++++++-
tomcat/osmap.yaml | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/test/integration/tomcat_install/controls/yaml_dump_spec.rb b/test/integration/tomcat_install/controls/yaml_dump_spec.rb
index 477fff9..aeba17d 100644
--- a/test/integration/tomcat_install/controls/yaml_dump_spec.rb
+++ b/test/integration/tomcat_install/controls/yaml_dump_spec.rb
@@ -209,6 +209,12 @@ control 'Tomcat `map.jinja` YAML dump' do
with_haveged: true
YAML_DUMP
when 'redhat', 'fedora'
+ case platform[:family]
+ when 'redhat'
+ ver = 7
+ when 'fedora'
+ ver = 9
+ end
<<~YAML_DUMP.chomp
arch: amd64
authbind: 'no'
@@ -379,7 +385,7 @@ control 'Tomcat `map.jinja` YAML dump' do
"%{User-Agent}i" %D'
- className: org.apache.catalina.authenticator.SingleSignOn
user: tomcat
- ver: 7
+ ver: #{ver}
with_haveged: false
YAML_DUMP
when 'suse'
diff --git a/tomcat/osmap.yaml b/tomcat/osmap.yaml
index de11a67..a9a506e 100644
--- a/tomcat/osmap.yaml
+++ b/tomcat/osmap.yaml
@@ -15,7 +15,8 @@ Ubuntu: {}
Raspbian: {}
# os_family: RedHat
-Fedora: {}
+Fedora:
+ ver: 9
CentOS: {}
Amazon: {}
--
GitLab