Skip to content

Commit

Permalink
jws: ensure that tc_vault pkg are install if install method is rpm
Browse files Browse the repository at this point in the history
  • Loading branch information
rpelisse committed Aug 22, 2022
1 parent 6e75175 commit dd1a471
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions roles/jws/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jws_tomcat_vault_iteration: '44'
jws_tomcat_vault_salt: '1234abcd'
jws_tomcat_vault_properties: 'vault.properties'
jws_tomcat_vault_data: 'VAULT.dat'
jws_tomcat_vault_rpm_name: 'jws5-tomcat-vault'

# modcluster configuration
jws_modcluster_enabled: False
Expand Down
4 changes: 4 additions & 0 deletions roles/jws/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@ argument_specs:
default: "VAULT.dat"
description: "vault.data filename"
type: "str"
jws_tomcat_vault_rpm_name:
default: "jws5-tomcat-vault"
description: "RPM package to install for tomcat vault (only used if install method is 'rpm')."
type: "str"
jws_modcluster_enabled:
# line 42 of jws/defaults/main.yml
default: False
Expand Down
9 changes: 9 additions & 0 deletions roles/jws/tasks/install/rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,12 @@
creates: "{{ jws_rpm_root_dir }}/enable"
notify:
- Ensure Tomcat runs under systemd

- name: "Install tomcat vault extra packages, if requested."
block:
- name: "Install package for tomcat_vault: {{ jws.vault.package_name }}"
ansible.builtin.package:
name: "{{ jws.vault.package_name }}"
state: present
when:
- jws_tomcat_vault_enabled is defined and jws_tomcat_vault_enabled
1 change: 1 addition & 0 deletions roles/jws/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jws:
secretRequired: "{{ jws_listen_ajp_secret_required }}"
secret: "{{ jws_listen_ajp_secret }}"
vault:
package_name: "{{ jws_tomcat_vault_rpm_name }}"
name: "{{ jws_tomcat_vault_keystore }}"
enable: "{{ jws_tomcat_vault_enabled }}"
alias: "{{ jws_tomcat_vault_alias }}"
Expand Down

0 comments on commit dd1a471

Please sign in to comment.