File tree Expand file tree Collapse file tree 15 files changed +125
-69
lines changed Expand file tree Collapse file tree 15 files changed +125
-69
lines changed Original file line number Diff line number Diff line change 5
5
FEATURES:
6
6
7
7
* Add support for NGINX App Protect DoS (Denial of Service) product. The ` nginx_app_protect_dos_enable ` variable must be set to ` true ` in order to install NGINX App Protect DoS.
8
+ * Add support for NGINX App Protect WAF on Amazon Linux 2 (requires NGINX App Protect 3.3).
8
9
* Add a ` nginx_app_protect_manage_repo ` feature flag which can be used to disable NGINX App Protect repo management by this role.
9
10
10
11
ENHANCEMENTS:
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ The NGINX App Protect Ansible role supports all platforms supported by [NGINX Pl
65
65
` ` ` yaml
66
66
Alpine:
67
67
- 3.10
68
- name: Amazon Linux 2
68
+ Amazon Linux 2:
69
69
- any
70
70
CentOS:
71
71
- 7.4+
Original file line number Diff line number Diff line change 25
25
&& dnf clean all; \
26
26
elif [ $(command -v yum) ]; then \
27
27
yum makecache fast \
28
- && yum install -y bash iproute sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl \
28
+ && yum install -y bash iproute sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl initscripts \
29
29
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \
30
30
&& yum clean all; \
31
31
elif [ $(command -v zypper) ]; then \
Original file line number Diff line number Diff line change @@ -39,8 +39,8 @@ platforms:
39
39
- nap
40
40
networks :
41
41
- name : molecule-test
42
- - name : ubuntu-bionic
43
- image : ubuntu:bionic
42
+ - name : debian-buster
43
+ image : debian:buster-slim
44
44
dockerfile : ../Dockerfile.j2
45
45
privileged : true
46
46
volumes :
@@ -50,8 +50,8 @@ platforms:
50
50
- nap
51
51
networks :
52
52
- name : molecule-test
53
- - name : ubuntu-focal
54
- image : ubuntu:focal
53
+ - name : ubuntu-bionic
54
+ image : ubuntu:bionic
55
55
dockerfile : ../Dockerfile.j2
56
56
privileged : true
57
57
volumes :
@@ -61,8 +61,8 @@ platforms:
61
61
- nap
62
62
networks :
63
63
- name : molecule-test
64
- - name : debian-buster
65
- image : debian:buster-slim
64
+ - name : ubuntu-focal
65
+ image : ubuntu:focal
66
66
dockerfile : ../Dockerfile.j2
67
67
privileged : true
68
68
volumes :
Original file line number Diff line number Diff line change 17
17
force : false
18
18
mode : 0444
19
19
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
-
36
20
- name : Set up rsyslog server for verifying NAP syslog events
37
21
hosts : nap
38
22
tasks :
51
35
- name : Start nginx on test workload
52
36
raw : nohup nginx </dev/null >/dev/null 2>&1 & sleep 1
53
37
changed_when : false
38
+
39
+ - name : Install NGINX Plus on Alpine
40
+ hosts : nap
41
+ tasks :
42
+ - name : Set up NGINX Plus on Alpine for NAP 3.2/3.3 issue workaround (remove in versions > 3.3)
43
+ include_role :
44
+ name : nginxinc.nginx
45
+ vars :
46
+ nginx_enable : true
47
+ nginx_start : true
48
+ nginx_type : plus
49
+ nginx_remove_license : false
50
+ nginx_license :
51
+ certificate : ../../files/license/nginx-repo.crt
52
+ key : ../../files/license/nginx-repo.key
53
+ when : ansible_os_family == "Alpine"
Original file line number Diff line number Diff line change @@ -17,36 +17,43 @@ platforms:
17
17
volumes :
18
18
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
19
19
command : " /sbin/init"
20
+ - name : amazonlinux-2
21
+ image : amazonlinux:2
22
+ dockerfile : ../Dockerfile.j2
23
+ privileged : true
24
+ volumes :
25
+ - " /sys/fs/cgroup:/sys/fs/cgroup:rw"
26
+ command : " /usr/sbin/init"
20
27
- name : centos-7
21
28
image : centos:7
22
29
dockerfile : ../Dockerfile.j2
23
30
privileged : true
24
31
volumes :
25
32
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
26
33
command : " /usr/sbin/init"
27
- - name : ubuntu-bionic
28
- image : ubuntu:bionic
34
+ - name : debian-stretch
35
+ image : debian:stretch-slim
29
36
dockerfile : ../Dockerfile.j2
30
37
privileged : true
31
38
volumes :
32
39
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
33
40
command : " /sbin/init"
34
- - name : ubuntu-focal
35
- image : ubuntu:focal
41
+ - name : debian-buster
42
+ image : debian:buster-slim
36
43
dockerfile : ../Dockerfile.j2
37
44
privileged : true
38
45
volumes :
39
46
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
40
47
command : " /sbin/init"
41
- - name : debian-stretch
42
- image : debian:stretch-slim
48
+ - name : ubuntu-bionic
49
+ image : ubuntu:bionic
43
50
dockerfile : ../Dockerfile.j2
44
51
privileged : true
45
52
volumes :
46
53
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
47
54
command : " /sbin/init"
48
- - name : debian-buster
49
- image : debian:buster-slim
55
+ - name : ubuntu-focal
56
+ image : ubuntu:focal
50
57
dockerfile : ../Dockerfile.j2
51
58
privileged : true
52
59
volumes :
Original file line number Diff line number Diff line change 20
20
- name : Install NGINX Plus on Alpine
21
21
hosts : all
22
22
tasks :
23
- - name : Set up NGINX Plus on Alpine for NAP 3.2 issue workaround (remove in versions > 3.2 )
23
+ - name : Set up NGINX Plus on Alpine for NAP 3.2/3.3 issue workaround (remove in versions > 3.3 )
24
24
include_role :
25
25
name : nginxinc.nginx
26
26
vars :
Original file line number Diff line number Diff line change 9
9
check_mode : true
10
10
register : install
11
11
failed_when : (install is changed) or (install is failed)
12
- when : ansible_os_family != "Alpine"
13
12
14
13
- name : Check if NGINX App Protect WAF is installed
15
14
package :
Original file line number Diff line number Diff line change 8
8
lint : |
9
9
set -e
10
10
yamllint .
11
- ansible-lint . --force-color
11
+ ansible-lint --force-color
12
12
platforms :
13
13
- name : alpine-3.10
14
14
image : alpine:3.10
@@ -24,29 +24,29 @@ platforms:
24
24
volumes :
25
25
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
26
26
command : " /usr/sbin/init"
27
- - name : ubuntu-bionic
28
- image : ubuntu:bionic
27
+ - name : debian-stretch
28
+ image : debian:stretch-slim
29
29
dockerfile : ../Dockerfile.j2
30
30
privileged : true
31
31
volumes :
32
32
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
33
33
command : " /sbin/init"
34
- - name : ubuntu-focal
35
- image : ubuntu:focal
34
+ - name : debian-buster
35
+ image : debian:buster-slim
36
36
dockerfile : ../Dockerfile.j2
37
37
privileged : true
38
38
volumes :
39
39
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
40
40
command : " /sbin/init"
41
- - name : debian-stretch
42
- image : debian:stretch-slim
41
+ - name : ubuntu-bionic
42
+ image : ubuntu:bionic
43
43
dockerfile : ../Dockerfile.j2
44
44
privileged : true
45
45
volumes :
46
46
- " /sys/fs/cgroup:/sys/fs/cgroup:rw"
47
47
command : " /sbin/init"
48
- - name : debian-buster
49
- image : debian:buster-slim
48
+ - name : ubuntu-focal
49
+ image : ubuntu:focal
50
50
dockerfile : ../Dockerfile.j2
51
51
privileged : true
52
52
volumes :
Original file line number Diff line number Diff line change 20
20
- name : Install NGINX Plus on Alpine
21
21
hosts : all
22
22
tasks :
23
- - name : Set up NGINX Plus on Alpine for NAP 3.2 issue workaround (remove in versions > 3.2 )
23
+ - name : Set up NGINX Plus on Alpine for NAP 3.2/3.3 issue workaround (remove in versions > 3.3 )
24
24
include_role :
25
25
name : nginxinc.nginx
26
26
vars :
You can’t perform that action at this time.
0 commit comments