Skip to content

Commit 1bd217d

Browse files
authored
Add manual trigger for Molecule test workflow (#97)
1 parent 66233a6 commit 1bd217d

File tree

11 files changed

+72
-2
lines changed

11 files changed

+72
-2
lines changed

.github/workflows/molecule.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- "*"
1212
schedule:
1313
- cron: "0 0 1 * *"
14+
workflow_dispatch:
1415
jobs:
1516
molecule:
1617
name: Molecule

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ DEPRECATION WARNINGS:
1414

1515
FEATURES:
1616

17-
Implement Release Drafter.
17+
* Implement Release Drafter.
18+
* Add warning re having to install NGINX Plus beforehand on Alpine distros if NGINX Plus releases a security patch.
1819

1920
ENHANCEMENTS:
2021

2122
* Changing the default policy directory from `/etc/nginx` to `/etc/app_protect/conf` to align with this change introduced in App Protect 3.2.
2223
* Update Ansible base to `2.10.8`, Ansible Lint to `5.0.7`, yamllint to `1.26.1` and Docker Python SDK to `5.0.0`.
2324
* Update the Ansible `community.general` collection to `3.0.2` and `community.docker` collection to `1.6.0`.
25+
* Update GitHub actions to add a workflow dispatch option.
2426

2527
## 0.4.3 (April 6, 2020)
2628

2729
BREAKING CHANGES:
2830

2931
The `nginx_app_protect_version` variable has been removed, as it cannot be implemented fully on all platforms.
3032

31-
3233
FEATURES:
3334

3435
* Add support for Dependabot.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ Ubuntu:
7070
- 20.04
7171
```
7272

73+
**Note:** Due to a packaging limitation in NGINX App Protect on Alpine, it may be required to explicitly install NGINX Plus on the instance **before** using the NGINX App Protect role if a hotfix version of NGINX Plus has been published. It is recommended to use the [NGINX Core](https://galaxy.ansible.com/nginxinc/nginx_core) Ansible role for this purpose.
74+
7375
## Role Variables
7476

7577
This role has multiple variables. The descriptions and defaults for all these variables can be found in the **[`defaults/`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/defaults/)** folder in the following files:

molecule/advanced/prepare.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@
1717
force: false
1818
mode: 0444
1919

20+
- name: Install NGINX Plus on Alpine
21+
hosts: nap
22+
tasks:
23+
- name: Set up NGINX Plus on Alpine for NAP 3.2 issue workaround (remove in versions > 3.2)
24+
include_role:
25+
name: nginxinc.nginx
26+
vars:
27+
nginx_enable: true
28+
nginx_start: true
29+
nginx_type: plus
30+
nginx_remove_license: false
31+
nginx_license:
32+
certificate: ../../files/license/nginx-repo.crt
33+
key: ../../files/license/nginx-repo.key
34+
when: ansible_os_family == "Alpine"
35+
2036
- name: Set up rsyslog server for verifying NAP syslog events
2137
hosts: nap
2238
tasks:

molecule/advanced/requirements.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
roles:
33
- name: robertdebock.rsyslog
44
version: 3.2.0
5+
- name: nginxinc.nginx
6+
version: 0.19.2

molecule/default/molecule.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
dependency:
3+
name: galaxy
4+
options:
5+
role-file: molecule/default/requirements.yml
26
driver:
37
name: docker
48
lint: |

molecule/default/prepare.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,19 @@
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444
19+
20+
- name: Install NGINX Plus on Alpine
21+
hosts: all
22+
tasks:
23+
- name: Set up NGINX Plus on Alpine for NAP 3.2 issue workaround (remove in versions > 3.2)
24+
include_role:
25+
name: nginxinc.nginx
26+
vars:
27+
nginx_enable: true
28+
nginx_start: true
29+
nginx_type: plus
30+
nginx_remove_license: false
31+
nginx_license:
32+
certificate: ../../files/license/nginx-repo.crt
33+
key: ../../files/license/nginx-repo.key
34+
when: ansible_os_family == "Alpine"

molecule/default/requirements.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
roles:
3+
- name: nginxinc.nginx
4+
version: 0.19.2

molecule/specific-version/molecule.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
dependency:
3+
name: galaxy
4+
options:
5+
role-file: molecule/default/requirements.yml
26
driver:
37
name: docker
48
lint: |

molecule/specific-version/prepare.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,19 @@
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444
19+
20+
- name: Install NGINX Plus on Alpine
21+
hosts: all
22+
tasks:
23+
- name: Set up NGINX Plus on Alpine for NAP 3.2 issue workaround (remove in versions > 3.2)
24+
include_role:
25+
name: nginxinc.nginx
26+
vars:
27+
nginx_enable: true
28+
nginx_start: true
29+
nginx_type: plus
30+
nginx_remove_license: false
31+
nginx_license:
32+
certificate: ../../files/license/nginx-repo.crt
33+
key: ../../files/license/nginx-repo.key
34+
when: ansible_os_family == "Alpine"

0 commit comments

Comments
 (0)