Missing required variables to enabled

ansible-middleware · Mar 21, 2022 · feca34d · feca34d
1 parent b7211a7
commit feca34d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/roles/jws/README.md b/roles/jws/README.md
@@ -39,6 +39,8 @@ Role Defaults
 |`tomcat_listen_http_bind_address`| Service bind address | `localhost` |
 |`tomcat_listen_http_enabled`| Enable listening on http port | `yes` |
 |`tomcat_listen_https_port`| Enable listening on https port | `8443` |
+|`tomcat_listen_https_bind_address`| Bind address for https | `::1` |
+|`tomcat_listen_https_enabled`| Enable listening on https port | `false` |
 |`tomcat_listen_ajp_enabled`| Enable listening on ajp port | `False` |
 |`tomcat_listen_ajp_address`| Bind address for ajp | `::1` |
 |`tomcat_listen_ajp_port`| Tomcat ajp listen port | `8009` |

diff --git a/roles/jws/defaults/main.yml b/roles/jws/defaults/main.yml
@@ -24,6 +24,8 @@ tomcat_listen_http_port: '8080'
 tomcat_listen_http_bind_address: 'localhost'
 tomcat_listen_http_enabled: 'yes'
 tomcat_listen_https_port: '8443'
+tomcat_listen_https_bind_address: 'localhost'
+tomcat_listen_https_enabled: 'false'
 
 tomcat_listen_ajp_enabled: 'False'
 tomcat_listen_ajp_address: '::1'

diff --git a/roles/jws/meta/argument_specs.yml b/roles/jws/meta/argument_specs.yml
@@ -112,11 +112,19 @@ argument_specs:
                 default: "yes"
                 description: "Enable listening on http port"
                 type: "str"
+            tomcat_listen_https_enabled:
+                default: "false"
+                description: "Enable listening on https connector"
+                type: "str"
             tomcat_listen_https_port:
                 # line 26 of jws/defaults/main.yml
                 default: "8443"
                 description: "Enable listening on https port"
                 type: "str"
+            tomcat_listen_https_bind_address:
+                default: "localhost"
+                description: "HTTPS Connector bind address"
+                type: "str"
             tomcat_listen_ajp_enabled:
                 # line 28 of jws/defaults/main.yml
                 default: "False"

diff --git a/roles/jws/templates/server.xml.j2 b/roles/jws/templates/server.xml.j2
@@ -102,7 +102,7 @@
          Either JSSE or OpenSSL style configuration may be used regardless of
          the SSLImplementation selected. JSSE style configuration is used below.
     -->
-{% if tomcat.listen.https.enabled is defined %}
+{% if tomcat.listen.https.enabled is defined and tomcat.listen.https.enabled %}
     <Connector port="{{ tomcat.listen.https.port }}"
                protocol="org.apache.coyote.http11.Http11NioProtocol"
 {% if tomcat.listen.https.bind_address is defined %}address="{{ tomcat.listen.https.bind_address }}"

diff --git a/roles/jws/vars/main.yml b/roles/jws/vars/main.yml
@@ -35,6 +35,8 @@ tomcat:
       enabled: "{{ tomcat_listen_http_enabled }}"
     https:
       port: "{{ tomcat_listen_https_port }}"
+      bind_address: "{{ tomcat_listen_https_bind_address }}"
+      enabled: "{{ tomcat_listen_https_enabled }}"
     ajp:
       enabled: "{{ tomcat_listen_ajp_enabled }}"
       address: "{{ tomcat_listen_ajp_address }}"