inital commit

Author: aknot242

README.md

@@ -91,8 +91,6 @@ This is a sample playbook file for using the role to install NGINX App Protect o
 - hosts: wafs
   become: true
   vars:
-    # Installs NGINX App Protect and all dependencies to the target host
-    app_protect_enable: true
 
     # Specify whether you want to maintain your version of NGINX App Protect, upgrade to the latest version, or remove NGINX App Protect.
     # Can be used with `app_protect_version` to achieve fine grained control on which version of NGINX App Protect is installed/used on each playbook execution.

defaults/main.yml

@@ -1,9 +1,6 @@
 ---
 # defaults file for ansible-role-nginx-app-protect
 
-# Installs NGINX App Protect and all dependencies to the target host
-app_protect_enable: true
-
 # Specify whether you want to maintain your version of NGINX App Protect, upgrade to the latest version, or remove NGINX App Protect.
 # Can be used with `app_protect_version` to achieve fine grained control on which version of NGINX App Protect is installed/used on each playbook execution.
 # Using 'present' will install the latest version (or 'app_protect_version') of NGINX App Protect on a fresh install.

tasks/install-app-protect-linux.yml

@@ -10,18 +10,3 @@
     name: "app-protect{{ nginx_version | default('') }}"
     state: "{{ app_protect_state }}"
   notify: "(Handler: All OSs) Restart NGINX"
-
-# - name: "Start NGINX App Protect"
-#   service:
-#     name: nginx-app-protect
-#     state: started
-#     enabled: true
-#   when:
-#     - not ansible_check_mode
-
-# - name: "Start NGINX"
-#   service:
-#     name: nginx
-#     state: reloaded
-#   when:
-#     - not ansible_check_mode

tasks/main.yml

@@ -21,44 +21,63 @@
     msg: "supported_os {{ supported_os }}"
     verbosity: 2
 
+- name: Debug app_protect_state
+  debug:
+    msg: "app_protect_state {{ app_protect_state }}"
+
 - name: Abort if the OS/version combination is not supported
   fail:
     msg: "NGINX App Protect is not supported on os family {{ ansible_distribution }} version {{ ansible_distribution_version }}"
   when: not supported_os
 
-- include_tasks: prerequisites/install-prerequisites.yml
-  tags: nginx_prerequisites
-
-- import_tasks: keys/apt-key.yml
-  when:
-    - ansible_os_family == "Debian"
-    - app_protect_install_signatures
-  tags: nginx_aptkey
-
-- import_tasks: keys/rpm-key.yml
-  when:
-    - ansible_os_family == "RedHat"
-    - app_protect_install_signatures
-  tags: nginx_rpmkey
-
-- name: "(All OSs) Setup license"
-  include_tasks: setup-license.yml
-  when: app_protect_enable or app_protect_install_signatures
-
-- name: "NGINX App Protect"
-  include_tasks: install-app-protect.yml
-  when: supported_os and app_protect_enable
-
-- name: "NGINX App Protect Signatures"
-  include_tasks: install-signatures.yml
-  when: supported_os and app_protect_install_signatures
-
-- name: "Remove license"
-  include_tasks: delete-license.yml
-  when:
-    - app_protect_delete_license
-  tags: app_protect_delete_license
-
-- name: "Configure NGINX Plus App Protect"
-  include_tasks: configure-app-protect.yml
-  when: supported_os and app_protect_configure
+
+- name: "Install NGINX App Protect"
+  block:
+
+    - include_tasks: prerequisites/install-prerequisites.yml
+      tags: nginx_prerequisites
+
+    - import_tasks: keys/apt-key.yml
+      when:
+        - ansible_os_family == "Debian"
+        - app_protect_install_signatures
+      tags: nginx_aptkey
+
+    - import_tasks: keys/rpm-key.yml
+      when:
+        - ansible_os_family == "RedHat"
+        - app_protect_install_signatures
+      tags: nginx_rpmkey
+
+    - name: "(All OSs) Setup license"
+      import_tasks: setup-license.yml
+      when: app_protect_install_signatures
+
+    - name: "Install NGINX App Protect"
+      import_tasks: install-app-protect.yml
+
+    - name: "NGINX App Protect Signatures"
+      import_tasks: install-signatures.yml
+      when: app_protect_install_signatures
+
+    - name: "Remove license"
+      import_tasks: delete-license.yml
+      when:
+        - app_protect_delete_license
+      tags: app_protect_delete_license
+
+    - name: "Configure NGINX App Protect"
+      import_tasks: configure-app-protect.yml
+      when: 
+        - supported_os
+        - app_protect_configure
+
+  when: app_protect_state != absent
+
+- name: "Remove NGINX App Protect"
+  block:
+
+    - name: "Remove NGINX App Protect"
+      import_tasks: install-app-protect.yml
+
+  when: app_protect_state == absent