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.

Sign up for GitHub

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 license removal step #122

Merged
merged 3 commits into from
Aug 27, 2021
Merged

Fix license removal step #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f2dca8
fix error caused by wrong playbook path
aknot242 Aug 25, 2021
6ef0cd8
describe issue
aknot242 Aug 25, 2021
94ba7f8
set default test to use default of remove license
aknot242 Aug 26, 2021
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 0.6.1 (Unreleased)

BUG FIXES:

Role was failing at license and repo removal step when using the default of `nginx_app_protect_remove_license: true`.

## 0.6.0 (July 13, 2021)

BREAKING CHANGES:
Expand Down
1 change: 0 additions & 1 deletion molecule/default/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
nginx_enable: true
nginx_start: true
nginx_type: plus
nginx_remove_license: false
nginx_license:
certificate: ../../files/license/nginx-repo.crt
key: ../../files/license/nginx-repo.key
Expand Down
9 changes: 7 additions & 2 deletions tasks/common/install/remove-license.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@
set_fact:
nginx_app_protect_license_status: absent

- name: Delete repository data
include_tasks: "{{ role_path }}/tasks/install/install-{{ ansible_os_family | lower }}.yml"
- name: Delete NGINX App Protect WAF repository data
include_tasks: "{{ role_path }}/tasks/waf/install/install-{{ ansible_os_family | lower }}.yml"
when: nginx_app_protect_waf_enable | bool

- name: Delete NGINX App Protect DoS repository data
include_tasks: "{{ role_path }}/tasks/dos/install/install-{{ ansible_os_family | lower }}.yml"
when: nginx_app_protect_dos_enable | bool

- name: Delete NGINX App Protect license
file:
Expand Down