diff --git a/.travis.yml b/.travis.yml index e6890903552e030ed9d2b8d45a5f36799e320819..8d0c9aeffa2b3714358672200a76b1f61a966891 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ jobs: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - # - env: INSTANCE=tomcat-install-debian-10-master-py3 + - env: INSTANCE=tomcat-install-debian-10-master-py3 - env: INSTANCE=tomcat-install-ubuntu-1804-master-py3 # - env: INSTANCE=tomcat-extend-ubuntu-1804-master-py3 # - env: INSTANCE=tomcat-install-centos-8-master-py3 diff --git a/.yamllint b/.yamllint index 61c747d35fb2f361182bdf7a678379cb28898c21..e80ebacdf03ceb17b2b6f6e7812548b691605d69 100644 --- a/.yamllint +++ b/.yamllint @@ -12,7 +12,7 @@ ignore: | node_modules/ test/**/states/**/*.sls .kitchen/ - tomcat/osmap.yaml + tomcat/osfamilymap.yaml yaml-files: # Default settings diff --git a/test/integration/tomcat_install/controls/packages_spec.rb b/test/integration/tomcat_install/controls/packages_spec.rb index a5190b70d8e8f97401284367c1ed9fff1382876f..2a93d78ea169c11a89929e6b58be60d703130864 100644 --- a/test/integration/tomcat_install/controls/packages_spec.rb +++ b/test/integration/tomcat_install/controls/packages_spec.rb @@ -7,7 +7,12 @@ control 'Tomcat packages' do packages = case platform[:family] when 'debian' - %w[tomcat8 haveged] + case platform[:release] + when /^10/ + %w[tomcat9 haveged] + else + %w[tomcat8 haveged] + end when 'redhat', 'fedora', 'suse' %w[tomcat] end diff --git a/test/integration/tomcat_install/controls/services_spec.rb b/test/integration/tomcat_install/controls/services_spec.rb index 088a70e63a4cb0fd90717259bfb752ee57a2a525..32b814de24a832fbbcd02f9eb36f9738d885a0f0 100644 --- a/test/integration/tomcat_install/controls/services_spec.rb +++ b/test/integration/tomcat_install/controls/services_spec.rb @@ -8,7 +8,12 @@ control 'Tomcat services' do services = case platform[:family] when 'debian' - %w[tomcat8 haveged] + case platform[:release] + when /^10/ + %w[tomcat9 haveged] + else + %w[tomcat8 haveged] + end when 'redhat', 'fedora', 'suse' %w[tomcat] end diff --git a/test/integration/tomcat_install/controls/yaml_dump_spec.rb b/test/integration/tomcat_install/controls/yaml_dump_spec.rb index b27838a2e3445c141f91c3bec3f526f29620c1c6..7723adda660b4212d269315e2e1612980d2b355c 100644 --- a/test/integration/tomcat_install/controls/yaml_dump_spec.rb +++ b/test/integration/tomcat_install/controls/yaml_dump_spec.rb @@ -7,7 +7,28 @@ control 'Tomcat `map.jinja` YAML dump' do yaml_dump += case platform[:family] when 'debian' + case platform[:release] + when /^10/ + conf_dir = '/etc/tomcat9' + group = 'tomcat' + main_config = '/etc/default/tomcat9' + manager_pkg = 'tomcat9-admin' + pkg = 'tomcat9' + service = 'tomcat9' + user = 'tomcat' + ver = 9 + else + conf_dir = '/etc/tomcat8' + group = 'tomcat8' + main_config = '/etc/default/tomcat8' + manager_pkg = 'tomcat8-admin' + pkg = 'tomcat8' + service = 'tomcat8' + user = 'tomcat8' + ver = 8 + end <<~YAML_DUMP.chomp + arch: amd64 authbind: 'no' catalina_base: /usr/share/tomcat catalina_home: /usr/share/tomcat @@ -15,7 +36,7 @@ control 'Tomcat `map.jinja` YAML dump' do catalina_tmpdir: /var/cache/tomcat/temp cluster: simple: true - conf_dir: /etc/tomcat8 + conf_dir: #{conf_dir} connectors: example_connector: port: 8443 @@ -72,7 +93,7 @@ control 'Tomcat `map.jinja` YAML dump' do global: simpleValue type: java.lang.Integer expires_when: 2 weeks - group: tomcat8 + group: #{group} haveged_enabled: true id: - example.com @@ -91,7 +112,7 @@ control 'Tomcat `map.jinja` YAML dump' do soft: 64000 logfile_compress: 1 logfile_days: 14 - main_config: /etc/default/tomcat8 + main_config: #{main_config} main_config_template: salt://tomcat/files/tomcat-default-Debian.template manager: roles: @@ -110,7 +131,7 @@ control 'Tomcat `map.jinja` YAML dump' do - manager-script - manager-jmx - manager-status - manager_pkg: tomcat8-admin + manager_pkg: #{manager_pkg} native_pkg: libtcnative-1 other_contexts: other-contexts: @@ -137,10 +158,10 @@ control 'Tomcat `map.jinja` YAML dump' do className: org.apache.catalina.webresources.DirResourceSet base: /var/lib/tomcat8/appconfig webAppMount: /WEB-INF/classes - pkg: tomcat8 + pkg: #{pkg} resources: {} security: 'no' - service: tomcat8 + service: #{service} service_enabled: true service_running: false sites: @@ -175,12 +196,13 @@ control 'Tomcat `map.jinja` YAML dump' do pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" "%{User-Agent}i" %D' - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat8 - ver: 8 + user: #{user} + ver: #{ver} with_haveged: true YAML_DUMP when 'redhat', 'fedora' <<~YAML_DUMP.chomp + arch: amd64 authbind: 'no' catalina_base: /usr/share/tomcat catalina_home: /usr/share/tomcat @@ -354,6 +376,7 @@ control 'Tomcat `map.jinja` YAML dump' do YAML_DUMP when 'suse' <<~YAML_DUMP.chomp + arch: amd64 authbind: 'no' catalina_base: /usr/share/tomcat catalina_home: /usr/share/tomcat