Skip to content

Commit aaf471a

Browse files
Bump ansible-lint from 5.4.0 to 6.0.1 in /.github/workflows/requirements (#230)
1 parent ecd92a8 commit aaf471a

File tree

20 files changed

+82
-82
lines changed

20 files changed

+82
-82
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ansible-core==2.12.3
22
Jinja2==3.0.3
3-
ansible-lint==5.4.0
3+
ansible-lint==6.0.1
44
yamllint==1.26.3
55
molecule[docker]==3.6.1
66
docker==5.0.3

handlers/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: (Handler - NGINX Config) Check NGINX
3-
command: nginx -t
3+
ansible.builtin.command: nginx -t
44
args:
55
chdir: /etc/nginx/
66
register: config_check
@@ -10,7 +10,7 @@
1010
listen: (Handler - NGINX Config) Run NGINX
1111

1212
- name: (Handler - NGINX Config) Print NGINX error if syntax check fails
13-
debug:
13+
ansible.builtin.debug:
1414
var: config_check.stderr_lines
1515
failed_when: config_check.rc != 0
1616
when:
@@ -20,7 +20,7 @@
2020
listen: (Handler - NGINX Config) Run NGINX
2121

2222
- name: (Handler - NGINX Config) Start/reload NGINX
23-
service:
23+
ansible.builtin.service:
2424
name: nginx
2525
state: reloaded
2626
when:

molecule/cleanup_module/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Configure NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true

molecule/cleanup_module/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: nginxinc.nginx
88
vars:
99
nginx_modules:
1010
- njs
1111

1212
- name: Create mock NGINX configuration file
13-
file:
13+
ansible.builtin.file:
1414
path: /etc/nginx/conf.d/mock.conf
1515
state: touch
1616
mode: 0644

molecule/cleanup_module/verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX service is running
14-
service:
14+
ansible.builtin.service:
1515
name: nginx
1616
state: started
1717
enabled: true
@@ -20,14 +20,14 @@
2020
failed_when: (service is changed) or (service is failed)
2121

2222
- name: Check default.conf does not exist
23-
stat:
23+
ansible.builtin.stat:
2424
path: /etc/nginx/conf.d/default.conf
2525
check_mode: true
2626
register: stat_result
2727
failed_when: stat_result.stat.exists
2828

2929
- name: Check mock.conf does not exist
30-
stat:
30+
ansible.builtin.stat:
3131
path: /etc/nginx/conf.d/mock.conf
3232
check_mode: true
3333
register: stat_result

molecule/default/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Configure NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true

molecule/default/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Install NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: nginxinc.nginx
88
vars:
99
nginx_modules:

molecule/default/verify.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX service is running
14-
service:
14+
ansible.builtin.service:
1515
name: nginx
1616
state: started
1717
enabled: true
@@ -20,49 +20,49 @@
2020
failed_when: (service is changed) or (service is failed)
2121

2222
- name: Check that a page returns a status 200 and fail if the words Hello World are not in the page contents
23-
uri:
23+
ansible.builtin.uri:
2424
url: http://localhost
2525
return_content: true
2626
register: this
2727
failed_when: "'Hello World' not in this.content"
2828

2929
- name: Check client body cache directory exists
30-
stat:
30+
ansible.builtin.stat:
3131
path: /var/cache/nginx/client
3232
check_mode: true
3333
register: stat_result
3434
failed_when: not stat_result.stat.exists
3535

3636
- name: Check proxy cache directory exists
37-
stat:
37+
ansible.builtin.stat:
3838
path: /var/cache/nginx/proxy
3939
check_mode: true
4040
register: stat_result
4141
failed_when: not stat_result.stat.exists
4242

4343
- name: Check default.conf exists
44-
stat:
44+
ansible.builtin.stat:
4545
path: /etc/nginx/conf.d/default.conf
4646
check_mode: true
4747
register: stat_result
4848
failed_when: not stat_result.stat.exists
4949

5050
- name: Check frontend_default.conf exists
51-
stat:
51+
ansible.builtin.stat:
5252
path: /etc/nginx/conf.d/frontend_default.conf
5353
check_mode: true
5454
register: stat_result
5555
failed_when: not stat_result.stat.exists
5656

5757
- name: Check backend_default.conf exists
58-
stat:
58+
ansible.builtin.stat:
5959
path: /etc/nginx/conf.d/backend/backend_default.conf
6060
check_mode: true
6161
register: stat_result
6262
failed_when: not stat_result.stat.exists
6363

6464
- name: Ensure default.conf contains 'location /'
65-
lineinfile:
65+
ansible.builtin.lineinfile:
6666
path: /etc/nginx/conf.d/default.conf
6767
line: " location / {"
6868
state: present
@@ -71,7 +71,7 @@
7171
failed_when: (conf is changed) or (conf is failed)
7272

7373
- name: Ensure frontend_default.conf contains 'alias directive'
74-
lineinfile:
74+
ansible.builtin.lineinfile:
7575
path: /etc/nginx/conf.d/frontend_default.conf
7676
line: " alias /usr/share/nginx/html;"
7777
state: present
@@ -80,7 +80,7 @@
8080
failed_when: (conf is changed) or (conf is failed)
8181

8282
- name: Ensure default.conf contains 'location /backend'
83-
lineinfile:
83+
ansible.builtin.lineinfile:
8484
path: /etc/nginx/conf.d/default.conf
8585
line: " location /backend {"
8686
state: present
@@ -89,7 +89,7 @@
8989
failed_when: (conf is changed) or (conf is failed)
9090

9191
- name: Ensure default.conf contains 'client_max_body_size 1m;'
92-
lineinfile:
92+
ansible.builtin.lineinfile:
9393
path: /etc/nginx/conf.d/default.conf
9494
line: "client_max_body_size 1m;"
9595
state: present
@@ -98,7 +98,7 @@
9898
failed_when: (conf is changed) or (conf is failed)
9999

100100
- name: Ensure default.conf contains 'rewrite (.*).html(.*) $1$2 last;'
101-
lineinfile:
101+
ansible.builtin.lineinfile:
102102
path: /etc/nginx/conf.d/default.conf
103103
line: " rewrite (.*).html(.*) $1$2 last;"
104104
state: present

molecule/plus/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: all
44
tasks:
55
- name: Configure NGINX
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx-config
88
vars:
99
nginx_config_debug_output: true

molecule/plus/prepare.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
gather_facts: false
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
7-
copy:
7+
ansible.builtin.copy:
88
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
99
dest: ../common/files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
14-
copy:
14+
ansible.builtin.copy:
1515
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
1616
dest: ../common/files/license/nginx-repo.key
1717
force: false
@@ -21,7 +21,7 @@
2121
hosts: all
2222
tasks:
2323
- name: Install NGINX
24-
include_role:
24+
ansible.builtin.include_role:
2525
name: nginxinc.nginx
2626
vars:
2727
nginx_type: plus
@@ -31,7 +31,7 @@
3131
nginx_remove_license: false
3232

3333
- name: Install NGINX App Protect WAF
34-
include_role:
34+
ansible.builtin.include_role:
3535
name: nginxinc.nginx_app_protect
3636
vars:
3737
nginx_app_protect_waf_enable: true

0 commit comments

Comments
 (0)