From cd788dd0454c33f1bad91c74a480fbce3cb8cbf6 Mon Sep 17 00:00:00 2001
From: Alessandro Fael Garcia <alessfg@hotmail.com>
Date: Tue, 22 Sep 2020 22:46:13 +0200
Subject: [PATCH] Fix license removal bug and prepare 0.3.1 release (#32)

---
 CHANGELOG.md                     | 13 +++++++++++--
 tasks/install/remove-license.yml |  2 +-
 tasks/main.yml                   |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef45d783..b6849131 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.3.1 (Unreleased)
+## 0.3.1 (September 22, 2020)
+
+FEATURES:
+
+*   Two new variables have been introduced:
+    *   `nginx_app_protect_service_modify` -- Setting this variable to true/false will determine whether the default service timeout value gets modified.
+    *   `nginx_app_protect_log_policy_target` -- This variable is intended as an eventual replacement for `nginx_app_protect_log_policy_syslog_target` and allows using different destinations for NGINX App Protect's log files.
 
 ENHANCEMENTS:
 
@@ -9,7 +15,6 @@ ENHANCEMENTS:
 BUG FIXES:
 
 *   Rename handlers to use more specific role related naming and prevent namespace collision issues.
-*   Add a `nginx_app_protect_service_modify` variable to revert a breaking change introduced in 0.3.0 where timeouts would not be set by default.
 *   Set NGINX handler to `state: restarted` to prevent some compatibility issues when NGINX App Protect is installed on an instance already running NGINX beforehand.
 *   Using `update_cache: true` by itself in the `apt` module is not always idempotent. Moved the NGINX App Protect installation task to a corresponding `apt` or `yum` module to avoid this scenario.
 
@@ -19,6 +24,10 @@ DEPRECATION WARNING:
 
 *   The ability to create an NGINX config including some basic App Protect directives has migrated to the NGINX config role available [here](https://github.com/nginxinc/ansible-role-nginx-config). Any new issues or PRs related to configuring NGINX App Protect directives should be submitted in the new NGINX Config repository. New issues or PRs related to configuring NGINX App Protect directives submitted in this repository will not be worked on. The NGINX App Protect directives configuration functionalities included in this role will be removed in an upcoming release.
 
+BREAKING CHANGES:
+
+*   `nginx_app_protect_delete_license` has been renamed to `nginx_app_protect_remove_license`.
+
 FEATURES:
 
 *   A new variable has been introduced:
diff --git a/tasks/install/remove-license.yml b/tasks/install/remove-license.yml
index 419b4718..872f77a1 100644
--- a/tasks/install/remove-license.yml
+++ b/tasks/install/remove-license.yml
@@ -4,7 +4,7 @@
     nginx_app_protect_license_status: absent
 
 - name: Delete repository data
-  include_tasks: "{{ role_path }}/tasks/install/setup-{{ ansible_facts['os_family'] | lower }}.yml"
+  include_tasks: "{{ role_path }}/tasks/install/install-{{ ansible_facts['os_family'] | lower }}.yml"
 
 - name: Delete NGINX App Protect license
   file:
diff --git a/tasks/main.yml b/tasks/main.yml
index 7b7d7bc4..d4a89bc7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -65,6 +65,9 @@
       tags: nginx_app_protect_configure
   when: nginx_app_protect_state != "absent"
 
+- name: Ensure NGINX App Protect is running
+  meta: flush_handlers
+
 - name: Remove NGINX App Protect
   block:
     - name: Remove NGINX App Protect package