Merge pull request #112 from csutherl/make-selinux-optional

Make selinux policy for JWS optional like the zip installation docs suggest it is
ansible-middleware · May 9, 2022 · 87238cc · 87238cc
2 parents 45651de + f1c12c7
commit 87238cc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/roles/jws/README.md b/roles/jws/README.md
@@ -54,6 +54,7 @@ Role Defaults
 |`jws_rhn_base_url`| Customer Portal Base URL for archive download | `https://access.redhat.com/jbossnetwork/restricted/softwareDownload.html?softwareId=` |
 |`jws_version`| Version of JWS to install | `5.6.0` |
 |`jws_apply_patches`| Install JWS most recent cumulative patch for requested version | `False` |
+|`jws_selinux_enabled` | Enable selinux policy enforcement for JWS | `True` |
 |`jws_home`| Default installation path for JWS archives | `{{ tomcat_install_dir }}/jws-{{ jws_version.split('.')[0] }}.{{ jws_version.split('.')[1] }}/tomcat` |
 |`tomcat_home`| Target installation directory, defaulting to tomcat or JWS archive path, or can be overridden | `{{ jws_home if tomcat_install_method == 'rhn_zipfiles' else tomcat_zipfile_home }}` |
 |`tomcat_user`| posix user account for service | `tomcat` |

diff --git a/roles/jws/defaults/main.yml b/roles/jws/defaults/main.yml
@@ -24,6 +24,7 @@ jws_home: "{{ tomcat_install_dir }}/jws-{{ jws_version.split('.')[0] }}.{{ jws_v
 jws_rhn_base_url: https://access.redhat.com/jbossnetwork/restricted/softwareDownload.html?softwareId=
 # if True automatically apply the most recent cumulative patch
 jws_apply_patches: False
+jws_selinux_enabled: True
 
 tomcat_user: tomcat
 tomcat_uid: 53

diff --git a/roles/jws/meta/argument_specs.yml b/roles/jws/meta/argument_specs.yml
@@ -45,6 +45,10 @@ argument_specs:
                 default: False
                 description: "Install JWS most recent cumulative patch for requested version"
                 type: "bool"
+            jws_selinux_enabled:
+                # line 27 of jws/defaults/main.yml
+                default: True
+                description: "Enable selinux policy enforcement for JWS"
             tomcat_version:
                 # line 7 of jws/defaults/main.yml
                 default: "9.0.60"

diff --git a/roles/jws/tasks/main.yml b/roles/jws/tasks/main.yml
@@ -134,6 +134,7 @@
       when:
         - tomcat.install_method is defined
         - tomcat.install_method != "rpm"
+        - jws_selinux_enabled and tomcat.install_method == "rhn_zipfiles"
 
     - name: "Remove apps"
       file: