From 0ffaa37f62d09e0fc4cbb197701ff337e49d7beb Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Thu, 14 Jan 2021 21:44:22 +0000 Subject: [PATCH 1/2] fix(_mapdata): ensure map data is directly under `values` * Semi-automated using https://github.com/myii/ssf-formula/pull/287 --- tomcat/_mapdata/init.sls | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tomcat/_mapdata/init.sls b/tomcat/_mapdata/init.sls index 2cff3f5..7b54576 100644 --- a/tomcat/_mapdata/init.sls +++ b/tomcat/_mapdata/init.sls @@ -6,9 +6,7 @@ {%- from tplroot ~ "/map.jinja" import tomcat with context %} {%- set _mapdata = { - "values": { - "tomcat": tomcat, - } + "values": tomcat, } %} {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %} From c869918446861cb002f57a2c25b28f0cfdd4ebd6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 14 Jan 2021 21:25:07 +0000 Subject: [PATCH 2/2] test(_mapdata): update for `_mapdata/init.sls` change --- .../default/files/_mapdata/amazonlinux-1.yaml | 343 +++++++++--------- .../default/files/_mapdata/amazonlinux-2.yaml | 343 +++++++++--------- .../files/_mapdata/arch-base-latest.yaml | 343 +++++++++--------- .../default/files/_mapdata/centos-6.yaml | 343 +++++++++--------- .../default/files/_mapdata/centos-7.yaml | 343 +++++++++--------- .../default/files/_mapdata/centos-8.yaml | 343 +++++++++--------- .../default/files/_mapdata/debian-10.yaml | 343 +++++++++--------- .../default/files/_mapdata/debian-9.yaml | 343 +++++++++--------- .../default/files/_mapdata/fedora-31.yaml | 343 +++++++++--------- .../default/files/_mapdata/fedora-32.yaml | 343 +++++++++--------- .../default/files/_mapdata/opensuse-15.yaml | 343 +++++++++--------- .../default/files/_mapdata/ubuntu-16.yaml | 343 +++++++++--------- .../default/files/_mapdata/ubuntu-18.yaml | 343 +++++++++--------- .../default/files/_mapdata/ubuntu-20.yaml | 343 +++++++++--------- 14 files changed, 2394 insertions(+), 2408 deletions(-) diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index 5ea3c04..563dc45 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml @@ -2,176 +2,175 @@ # Amazon Linux AMI-2018 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 7 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 7 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index b1bc9fa..ad365d1 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -2,176 +2,175 @@ # Amazon Linux-2 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 7 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 7 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 96e92ac..bfede5a 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -2,176 +2,175 @@ # Arch --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat8 - catalina_home: /usr/share/tomcat8 - catalina_pid: /var/run/tomcat8.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat8 - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat8 - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/default-runtime - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /var/tmp/tomcat8/temp - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /usr/lib/systemd/system/tomcat8.service - main_config_template: salt://tomcat/files/tomcat-default-Arch.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: '' - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat8 - resources: {} - security: 'no' - service: tomcat8 - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat8 + catalina_home: /usr/share/tomcat8 + catalina_pid: /var/run/tomcat8.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat8 + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat8 + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/default-runtime + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /var/tmp/tomcat8/temp + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /usr/lib/systemd/system/tomcat8.service + main_config_template: salt://tomcat/files/tomcat-default-Arch.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: '' + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat8 - ver: 8 - with_haveged: false + pkg: tomcat8 + resources: {} + security: 'no' + service: tomcat8 + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat8 + ver: 8 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index cfc4da1..ed2c567 100644 --- a/test/integration/default/files/_mapdata/centos-6.yaml +++ b/test/integration/default/files/_mapdata/centos-6.yaml @@ -2,176 +2,175 @@ # CentOS Linux-7 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 7 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 7 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index cfc4da1..ed2c567 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -2,176 +2,175 @@ # CentOS Linux-7 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 7 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 7 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 9e1d4a3..f62203a 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -2,176 +2,175 @@ # CentOS Linux-8 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 7 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 7 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 7864f27..f2070b9 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -2,176 +2,175 @@ # Debian-10 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /var/lib/tomcat9 - catalina_home: /usr/share/tomcat9 - catalina_pid: /var/run/tomcat9.pid - catalina_tmpdir: /var/cache/tomcat9/temp - cluster: - simple: true - common_pkg: tomcat9-common - conf_dir: /etc/tomcat9 - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: true - id: - - example.com - - example.net - java_home: /usr/lib/jvm/default-java - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/default/tomcat9 - main_config_template: salt://tomcat/files/tomcat-default-Debian.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat9-admin - native_pkg: libtcnative-1 - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat9 - resources: {} - security: 'no' - service: tomcat9 - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /var/lib/tomcat9 + catalina_home: /usr/share/tomcat9 + catalina_pid: /var/run/tomcat9.pid + catalina_tmpdir: /var/cache/tomcat9/temp + cluster: + simple: true + common_pkg: tomcat9-common + conf_dir: /etc/tomcat9 + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: true + id: + - example.com + - example.net + java_home: /usr/lib/jvm/default-java + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/default/tomcat9 + main_config_template: salt://tomcat/files/tomcat-default-Debian.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat9-admin + native_pkg: libtcnative-1 + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 9 - with_haveged: true + pkg: tomcat9 + resources: {} + security: 'no' + service: tomcat9 + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 9 + with_haveged: true diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 2d8e816..6d7c315 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -2,176 +2,175 @@ # Debian-9 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /var/lib/tomcat8 - catalina_home: /usr/share/tomcat8 - catalina_pid: /var/run/tomcat8.pid - catalina_tmpdir: /var/cache/tomcat8/temp - cluster: - simple: true - common_pkg: tomcat8-common - conf_dir: /etc/tomcat8 - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat8 - haveged_enabled: true - id: - - example.com - - example.net - java_home: /usr/lib/jvm/default-java - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/default/tomcat8 - main_config_template: salt://tomcat/files/tomcat-default-Debian.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat8-admin - native_pkg: libtcnative-1 - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat8 - resources: {} - security: 'no' - service: tomcat8 - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /var/lib/tomcat8 + catalina_home: /usr/share/tomcat8 + catalina_pid: /var/run/tomcat8.pid + catalina_tmpdir: /var/cache/tomcat8/temp + cluster: + simple: true + common_pkg: tomcat8-common + conf_dir: /etc/tomcat8 + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat8 + haveged_enabled: true + id: + - example.com + - example.net + java_home: /usr/lib/jvm/default-java + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/default/tomcat8 + main_config_template: salt://tomcat/files/tomcat-default-Debian.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat8-admin + native_pkg: libtcnative-1 + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat8 - ver: 8 - with_haveged: true + pkg: tomcat8 + resources: {} + security: 'no' + service: tomcat8 + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat8 + ver: 8 + with_haveged: true diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index 9a828b6..7a94c47 100644 --- a/test/integration/default/files/_mapdata/fedora-31.yaml +++ b/test/integration/default/files/_mapdata/fedora-31.yaml @@ -2,176 +2,175 @@ # Fedora-31 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 9 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 9 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 12dbc5e..cf7c473 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -2,176 +2,175 @@ # Fedora-32 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: tomcat-native - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: tomcat-native + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 9 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 9 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index a64a056..447ed1e 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -2,176 +2,175 @@ # Leap-15 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /usr/share/tomcat - catalina_home: /usr/share/tomcat - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat-common - conf_dir: /etc/tomcat - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: false - id: - - example.com - - example.net - java_home: /usr/lib/jvm/jre - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/sysconfig/tomcat - main_config_template: salt://tomcat/files/tomcat-default-CentOS.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat-admin-webapps - native_pkg: libtcnative-1-0 - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat - resources: {} - security: 'no' - service: tomcat - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /usr/share/tomcat + catalina_home: /usr/share/tomcat + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat-common + conf_dir: /etc/tomcat + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: false + id: + - example.com + - example.net + java_home: /usr/lib/jvm/jre + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/sysconfig/tomcat + main_config_template: salt://tomcat/files/tomcat-default-CentOS.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat-admin-webapps + native_pkg: libtcnative-1-0 + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 8 - with_haveged: false + pkg: tomcat + resources: {} + security: 'no' + service: tomcat + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 8 + with_haveged: false diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 1ecf5b9..d743573 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -2,176 +2,175 @@ # Ubuntu-16.04 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /var/lib/tomcat9 - catalina_home: /usr/share/tomcat9 - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat9-common - conf_dir: /etc/tomcat9 - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: true - id: - - example.com - - example.net - java_home: /usr/lib/jvm/default-java - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/default/tomcat9 - main_config_template: salt://tomcat/files/tomcat-default-Debian.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat9-admin - native_pkg: libtcnative-1 - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat9 - resources: {} - security: 'no' - service: tomcat9 - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /var/lib/tomcat9 + catalina_home: /usr/share/tomcat9 + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat9-common + conf_dir: /etc/tomcat9 + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: true + id: + - example.com + - example.net + java_home: /usr/lib/jvm/default-java + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/default/tomcat9 + main_config_template: salt://tomcat/files/tomcat-default-Debian.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat9-admin + native_pkg: libtcnative-1 + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 9 - with_haveged: true + pkg: tomcat9 + resources: {} + security: 'no' + service: tomcat9 + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 9 + with_haveged: true diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 1fe3981..f97d8af 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -2,176 +2,175 @@ # Ubuntu-18.04 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /var/lib/tomcat9 - catalina_home: /usr/share/tomcat9 - catalina_pid: /var/run/tomcat.pid - catalina_tmpdir: /var/cache/tomcat/temp - cluster: - simple: true - common_pkg: tomcat9-common - conf_dir: /etc/tomcat9 - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: true - id: - - example.com - - example.net - java_home: /usr/lib/jvm/default-java - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/default/tomcat9 - main_config_template: salt://tomcat/files/tomcat-default-Debian.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat9-admin - native_pkg: libtcnative-1 - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat9 - resources: {} - security: 'no' - service: tomcat9 - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /var/lib/tomcat9 + catalina_home: /usr/share/tomcat9 + catalina_pid: /var/run/tomcat.pid + catalina_tmpdir: /var/cache/tomcat/temp + cluster: + simple: true + common_pkg: tomcat9-common + conf_dir: /etc/tomcat9 + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: true + id: + - example.com + - example.net + java_home: /usr/lib/jvm/default-java + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/default/tomcat9 + main_config_template: salt://tomcat/files/tomcat-default-Debian.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat9-admin + native_pkg: libtcnative-1 + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 9 - with_haveged: true + pkg: tomcat9 + resources: {} + security: 'no' + service: tomcat9 + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 9 + with_haveged: true diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index c48fed7..1d5e9e8 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -2,176 +2,175 @@ # Ubuntu-20.04 --- values: - tomcat: - arch: amd64 - authbind: 'no' - catalina_base: /var/lib/tomcat9 - catalina_home: /usr/share/tomcat9 - catalina_pid: /var/run/tomcat9.pid - catalina_tmpdir: /var/cache/tomcat9/temp - cluster: - simple: true - common_pkg: tomcat9-common - conf_dir: /etc/tomcat9 - connectors: - example_connector: - SSLEnabled: 'false' - URIEncoding: UTF-8 - acceptCount: 100 - clientAuth: 'false' - connectionTimeout: 20000 - disableUploadTimeout: 'true' - enableLookups: 'false' - keystoreFile: /path/to/keystoreFile - keystorePass: somerandomtext - maxHttpHeaderSize: 8192 - maxThreads: 150 - minSpareThreads: 25 - port: 8443 - protocol: org.apache.coyote.http11.Http11Protocol - redirectPort: 8443 - scheme: https - secure: 'true' - sslProtocol: TLS - context: - Environment: - env.first: - name: env.first - override: true - type: java.lang.String - value: first.text - env.second: - name: env.second - override: false - type: some.other.type - value: second.value - Listener: - first: - className: org.apache.catalina.security.SecurityListener - second: - SSLEngine: 'on' - className: org.apache.catalina.core.AprLifecycleListener - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - ResourceLink: - any_name_here_will_be_ignored: - global: simpleValue - name: linkToGlobalResource - type: java.lang.Integer - expires_when: 2 weeks - group: tomcat - haveged_enabled: true - id: - - example.com - - example.net - java_home: /usr/lib/jvm/default-java - java_opts: - - Djava.awt.headless=true - - Xmx128m - - XX:MaxPermSize=256m - - Dlog4j.configuration=file:/tmp/log4j.properties - - Dlogback.configurationFile=/tmp/logback.xml - jsp_compiler: javac - jvm_tmp: /tmp/tomcat - limit: - hard: 64000 - soft: 64000 - logfile_compress: 1 - logfile_days: 14 - main_config: /etc/default/tomcat9 - main_config_template: salt://tomcat/files/tomcat-default-Debian.template - manager: - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - users: - saltuser1: - passwd: RfgpE2iQwD - roles: manager-gui,manager-script,manager-jmx,manager-status - saltuser2: - passwd: RfgpE2iQwD - roles: - - manager-gui - - manager-script - - manager-jmx - - manager-status - manager_pkg: tomcat9-admin - native_pkg: libtcnative-1 - other_contexts: - other-contexts: - elements: - Resource: - jdbc: - auth: Container - driverClassName: org.postgresql.Driver - maxActive: 20 - maxIdle: 10 - maxWait: -1 - name: jdbc/__postgres - password: aycaramba! - type: javax.sql.DataSource - url: jdbc:postgresql://db.server/dbname - user: dbuser - Resources: - PostResources: - base: /var/lib/tomcat8/appconfig - className: org.apache.catalina.webresources.DirResourceSet - webAppMount: /WEB-INF/classes - params: - crossContext: 'true' - debug: 1 - docBase: /path/to/webapp - reloadable: 'true' - pkg: tomcat9 - resources: {} - security: 'no' - service: tomcat9 - service_enabled: true - service_running: false - sites: - example.com: - alias: www.example.com - appBase: ../webapps/myapp - debug: 0 - docBase: ../webapps/myapp - host_parameters: - autoDeploy: 'true' - deployXML: 'false' - unpackWARs: 'true' - name: tomcat-server - path: '' + arch: amd64 + authbind: 'no' + catalina_base: /var/lib/tomcat9 + catalina_home: /usr/share/tomcat9 + catalina_pid: /var/run/tomcat9.pid + catalina_tmpdir: /var/cache/tomcat9/temp + cluster: + simple: true + common_pkg: tomcat9-common + conf_dir: /etc/tomcat9 + connectors: + example_connector: + SSLEnabled: 'false' + URIEncoding: UTF-8 + acceptCount: 100 + clientAuth: 'false' + connectionTimeout: 20000 + disableUploadTimeout: 'true' + enableLookups: 'false' + keystoreFile: /path/to/keystoreFile + keystorePass: somerandomtext + maxHttpHeaderSize: 8192 + maxThreads: 150 + minSpareThreads: 25 + port: 8443 + protocol: org.apache.coyote.http11.Http11Protocol + redirectPort: 8443 + scheme: https + secure: 'true' + sslProtocol: TLS + context: + Environment: + env.first: + name: env.first + override: true + type: java.lang.String + value: first.text + env.second: + name: env.second + override: false + type: some.other.type + value: second.value + Listener: + first: + className: org.apache.catalina.security.SecurityListener + second: + SSLEngine: 'on' + className: org.apache.catalina.core.AprLifecycleListener + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + ResourceLink: + any_name_here_will_be_ignored: + global: simpleValue + name: linkToGlobalResource + type: java.lang.Integer + expires_when: 2 weeks + group: tomcat + haveged_enabled: true + id: + - example.com + - example.net + java_home: /usr/lib/jvm/default-java + java_opts: + - Djava.awt.headless=true + - Xmx128m + - XX:MaxPermSize=256m + - Dlog4j.configuration=file:/tmp/log4j.properties + - Dlogback.configurationFile=/tmp/logback.xml + jsp_compiler: javac + jvm_tmp: /tmp/tomcat + limit: + hard: 64000 + soft: 64000 + logfile_compress: 1 + logfile_days: 14 + main_config: /etc/default/tomcat9 + main_config_template: salt://tomcat/files/tomcat-default-Debian.template + manager: + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + users: + saltuser1: + passwd: RfgpE2iQwD + roles: manager-gui,manager-script,manager-jmx,manager-status + saltuser2: + passwd: RfgpE2iQwD + roles: + - manager-gui + - manager-script + - manager-jmx + - manager-status + manager_pkg: tomcat9-admin + native_pkg: libtcnative-1 + other_contexts: + other-contexts: + elements: + Resource: + jdbc: + auth: Container + driverClassName: org.postgresql.Driver + maxActive: 20 + maxIdle: 10 + maxWait: -1 + name: jdbc/__postgres + password: aycaramba! + type: javax.sql.DataSource + url: jdbc:postgresql://db.server/dbname + user: dbuser + Resources: + PostResources: + base: /var/lib/tomcat8/appconfig + className: org.apache.catalina.webresources.DirResourceSet + webAppMount: /WEB-INF/classes + params: + crossContext: 'true' + debug: 1 + docBase: /path/to/webapp reloadable: 'true' - example.net: - alias: www.example.net - appBase: ../webapps/myapp2 - debug: 0 - docBase: ../webapps/myapp2 - host_parameters: - autoDeploy: 'true' - unpackWARs: 'true' - path: '' - reloadable: 'true' - valves: - - className: org.apache.catalina.valves.AccessLogValve - directory: logs - fileDateFormat: yyyy-MM-dd-HH - pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" - "%{User-Agent}i" %D' - prefix: localhost_access_log. - suffix: .log - - className: org.apache.catalina.authenticator.SingleSignOn - user: tomcat - ver: 9 - with_haveged: true + pkg: tomcat9 + resources: {} + security: 'no' + service: tomcat9 + service_enabled: true + service_running: false + sites: + example.com: + alias: www.example.com + appBase: ../webapps/myapp + debug: 0 + docBase: ../webapps/myapp + host_parameters: + autoDeploy: 'true' + deployXML: 'false' + unpackWARs: 'true' + name: tomcat-server + path: '' + reloadable: 'true' + example.net: + alias: www.example.net + appBase: ../webapps/myapp2 + debug: 0 + docBase: ../webapps/myapp2 + host_parameters: + autoDeploy: 'true' + unpackWARs: 'true' + path: '' + reloadable: 'true' + valves: + - className: org.apache.catalina.valves.AccessLogValve + directory: logs + fileDateFormat: yyyy-MM-dd-HH + pattern: '%h %l %u %t "%m http://%v%U %H" %s %b "%{Referer}i" + "%{User-Agent}i" %D' + prefix: localhost_access_log. + suffix: .log + - className: org.apache.catalina.authenticator.SingleSignOn + user: tomcat + ver: 9 + with_haveged: true