Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix condition for transferring key/trust store #163

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/activemq/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Role Defaults
|`activemq_critical_analyzer`| Should the broker detect dead locks and other issues | `true` |
|`activemq_critical_analyzer_timeout`| Timeout used to do the critical analysis (milliseconds) | `120000` |
|`activemq_critical_analyzer_check_period`| Time used to check the response times (milliseconds) | `60000` |
|`activemq_critical_analyzer_policy`| Should the server log, be halted or shutdown upon failures (one of LOG, HALT, SHUTDOWN) | `HALT` |
|`activemq_critical_analyzer_policy`| Should the server log, be halted or shutdown upon failures (one of LOG, HALT, SHUTDOWN) | `LOG` |


#### Acceptors / connectors
Expand Down
4 changes: 2 additions & 2 deletions roles/activemq/tasks/keystores.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
group: "{{ activemq_service_group }}"
mode: '0400'
when:
- activemq_tls_truststore_path is defined
- activemq_tls_truststore_path | default('', true) | length > 0
- activemq_tls_enabled
become: true

Expand All @@ -19,6 +19,6 @@
group: "{{ activemq_service_group }}"
mode: '0400'
when:
- activemq_tls_keystore_path is defined
- activemq_tls_keystore_path | default('', true) | length > 0
- activemq_tls_enabled
become: true
2 changes: 1 addition & 1 deletion roles/activemq/templates/amq_broker.sysconfig.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# {{ ansible_managed }}
JAVA_ARGS='{{ activemq_java_opts }} {{ activemq_logger_opts }} {{ activemq_jmx_opts }} {{ activemq_properties_opts }}'
JAVA_ARGS="{{ activemq_java_opts }} {{ activemq_logger_opts }} {{ activemq_jmx_opts }} {{ activemq_properties_opts }}"
JAVA_HOME={{ activemq_java_home | default(activemq_rpm_java_home, true) }}
HAWTIO_ROLE='{{ activemq_hawtio_role }}'
ARTEMIS_INSTANCE_URI='file:{{ activemq.instance_home }}/'
Expand Down