Skip to content

Commit 368ea77

Browse files
alessfgalessfg
authored
Remove Yamllint (#532)
1 parent d5c367d commit 368ea77

40 files changed

+390
-419
lines changed

‎.ansible-lint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
skip_list:
3+
- yaml[line-length]

‎.yamllint

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ BUG FIXES:
2525
TESTS:
2626

2727
* Create downgrade and upgrade tests for NGINX Plus.
28+
* Remove Yamllint (Ansible Lint now incorporates Yamllint).
29+
* Skip Ansible Lint line length rule.
2830

2931
## 0.23.1 (April 6, 2022)
3032

‎defaults/main/logrotate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
nginx_logrotate_conf_enable: false
44
nginx_logrotate_conf:
55
paths:
6-
- "/var/log/nginx/*.log"
6+
- /var/log/nginx/*.log
77
options:
88
- daily
99
- missingok
1010
- rotate 14
1111
- compress
1212
- delaycompress
1313
- notifempty
14-
- create 0644 www-data adm # Changes nginx logs permissions
14+
- create 0644 www-data adm # Changes nginx logs permissions
1515
- sharedscripts

‎defaults/main/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ nginx_install_source_zlib: false
5757
# You can select any of the static modules listed on http://nginx.org/en/docs/configure.html.
5858
# Format is '--with-*' where '*' should be used as static module name in the list below. (see an example below).
5959
# Default is 'http_ssl_module'. (DO NOT remove it if you need SSL support).
60-
nginx_static_modules: ['http_ssl_module']
60+
nginx_static_modules: [http_ssl_module]
6161
# nginx_static_modules: ['http_v2_module'] # Example for '--with-http_v2_module'
6262

6363
# (Optional) Choose where to fetch the NGINX signing key from.

‎meta/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ galaxy_info:
77

88
license: Apache License, Version 2.0
99

10-
min_ansible_version: '2.12'
10+
min_ansible_version: "2.12"
1111

1212
platforms:
1313
- name: Alpine
@@ -22,12 +22,12 @@ galaxy_info:
2222
- bullseye
2323
- name: EL
2424
versions:
25-
- '7'
26-
- '8'
27-
- '9'
25+
- "7"
26+
- "8"
27+
- "9"
2828
- name: FreeBSD
2929
versions:
30-
- '12.1'
30+
- "12.1"
3131
- name: Ubuntu
3232
versions:
3333
- bionic
@@ -36,8 +36,8 @@ galaxy_info:
3636
- jammy
3737
- name: SLES
3838
versions:
39-
- '12'
40-
- '15'
39+
- "12"
40+
- "15"
4141

4242
galaxy_tags:
4343
- nginx

‎molecule/default/converge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
pre_tasks:
55
- name: Set repo if Alpine
66
ansible.builtin.set_fact:
7-
version: "=1.21.6-r1"
7+
version: =1.21.6-r1
88
when: ansible_facts['os_family'] == "Alpine"
99
- name: Set repo if Debian
1010
ansible.builtin.set_fact:
11-
version: "=1.21.6-1~{{ ansible_facts['distribution_release'] }}"
11+
version: =1.21.6-1~{{ ansible_facts['distribution_release'] }}
1212
when: ansible_facts['os_family'] == "Debian"
1313
- name: Set repo if Red Hat
1414
ansible.builtin.set_fact:
15-
version: "-1.21.6-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
15+
version: -1.21.6-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
1616
when: ansible_facts['os_family'] == "RedHat"
1717
tasks:
1818
- name: Install NGINX

‎molecule/default/molecule.yml

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,107 +3,106 @@ driver:
33
name: docker
44
lint: |
55
set -e
6-
yamllint .
76
ansible-lint --force-color
87
platforms:
98
- name: alpine-3.13
109
image: alpine:3.13
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/sbin/init"
13+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14+
command: /sbin/init
1615
- name: alpine-3.14
1716
image: alpine:3.14
1817
dockerfile: ../common/Dockerfile.j2
1918
privileged: true
2019
volumes:
21-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
22-
command: "/sbin/init"
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
command: /sbin/init
2322
- name: alpine-3.15
2423
image: alpine:3.15
2524
dockerfile: ../common/Dockerfile.j2
2625
privileged: true
2726
volumes:
28-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
29-
command: "/sbin/init"
27+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28+
command: /sbin/init
3029
- name: alpine-3.16
3130
image: alpine:3.16
3231
dockerfile: ../common/Dockerfile.j2
3332
privileged: true
3433
volumes:
35-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36-
command: "/sbin/init"
34+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35+
command: /sbin/init
3736
- name: amazonlinux-2
3837
image: amazonlinux:2
3938
dockerfile: ../common/Dockerfile.j2
4039
privileged: true
4140
volumes:
42-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
43-
command: "/usr/sbin/init"
41+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42+
command: /usr/sbin/init
4443
- name: centos-7
4544
image: centos:7
4645
dockerfile: ../common/Dockerfile.j2
4746
privileged: true
4847
volumes:
49-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
50-
command: "/usr/sbin/init"
48+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49+
command: /usr/sbin/init
5150
- name: rhel-7
5251
image: registry.access.redhat.com/ubi7/ubi:7.9
5352
dockerfile: ../common/Dockerfile.j2
5453
privileged: true
5554
volumes:
56-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
57-
command: "/usr/sbin/init"
55+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
56+
command: /usr/sbin/init
5857
- name: rhel-8
5958
image: registry.access.redhat.com/ubi8/ubi:8.5
6059
dockerfile: ../common/Dockerfile.j2
6160
privileged: true
6261
volumes:
63-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
64-
command: "/usr/sbin/init"
62+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
63+
command: /usr/sbin/init
6564
- name: rhel-9
6665
image: registry.access.redhat.com/ubi9/ubi:9.0.0
6766
dockerfile: ../common/Dockerfile.j2
6867
privileged: true
6968
volumes:
70-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
71-
command: "/usr/sbin/init"
69+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
70+
command: /usr/sbin/init
7271
- name: debian-buster
7372
image: debian:buster-slim
7473
dockerfile: ../common/Dockerfile.j2
7574
privileged: true
7675
volumes:
77-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
78-
command: "/sbin/init"
76+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
77+
command: /sbin/init
7978
- name: debian-bullseye
8079
image: debian:bullseye-slim
8180
dockerfile: ../common/Dockerfile.j2
8281
privileged: true
8382
volumes:
84-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
85-
command: "/sbin/init"
83+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
84+
command: /sbin/init
8685
- name: ubuntu-bionic
8786
image: ubuntu:bionic
8887
dockerfile: ../common/Dockerfile.j2
8988
privileged: true
9089
volumes:
91-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
92-
command: "/sbin/init"
90+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
91+
command: /sbin/init
9392
- name: ubuntu-focal
9493
image: ubuntu:focal
9594
dockerfile: ../common/Dockerfile.j2
9695
privileged: true
9796
volumes:
98-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
99-
command: "/sbin/init"
97+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
98+
command: /sbin/init
10099
- name: ubuntu-jammy
101100
image: ubuntu:jammy
102101
dockerfile: ../common/Dockerfile.j2
103102
privileged: true
104103
volumes:
105-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
106-
command: "/sbin/init"
104+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
105+
command: /sbin/init
107106
provisioner:
108107
name: ansible
109108
playbooks:

‎molecule/downgrade/converge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
pre_tasks:
55
- name: Set repo if Alpine
66
ansible.builtin.set_fact:
7-
version: "=1.21.6-r1"
7+
version: =1.21.6-r1
88
when: ansible_facts['os_family'] == "Alpine"
99
- name: Set repo if Debian
1010
ansible.builtin.set_fact:
11-
version: "=1.21.6-1~{{ ansible_facts['distribution_release'] }}"
11+
version: =1.21.6-1~{{ ansible_facts['distribution_release'] }}
1212
when: ansible_facts['os_family'] == "Debian"
1313
- name: Set repo if Red Hat
1414
ansible.builtin.set_fact:
15-
version: "-1.21.6-1.{{ (ansible_facts['distribution'] == 'Amazon') | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx"
15+
version: -1.21.6-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
1616
when: ansible_facts['os_family'] == "RedHat"
1717
tasks:
1818
- name: Install NGINX

‎molecule/downgrade/molecule.yml

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,107 +3,106 @@ driver:
33
name: docker
44
lint: |
55
set -e
6-
yamllint .
76
ansible-lint --force-color
87
platforms:
98
- name: alpine-3.13
109
image: alpine:3.13
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/sbin/init"
13+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14+
command: /sbin/init
1615
- name: alpine-3.14
1716
image: alpine:3.14
1817
dockerfile: ../common/Dockerfile.j2
1918
privileged: true
2019
volumes:
21-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
22-
command: "/sbin/init"
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
command: /sbin/init
2322
- name: alpine-3.15
2423
image: alpine:3.15
2524
dockerfile: ../common/Dockerfile.j2
2625
privileged: true
2726
volumes:
28-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
29-
command: "/sbin/init"
27+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28+
command: /sbin/init
3029
- name: alpine-3.16
3130
image: alpine:3.16
3231
dockerfile: ../common/Dockerfile.j2
3332
privileged: true
3433
volumes:
35-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36-
command: "/sbin/init"
34+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35+
command: /sbin/init
3736
- name: amazonlinux-2
3837
image: amazonlinux:2
3938
dockerfile: ../common/Dockerfile.j2
4039
privileged: true
4140
volumes:
42-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
43-
command: "/usr/sbin/init"
41+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42+
command: /usr/sbin/init
4443
- name: centos-7
4544
image: centos:7
4645
dockerfile: ../common/Dockerfile.j2
4746
privileged: true
4847
volumes:
49-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
50-
command: "/usr/sbin/init"
48+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49+
command: /usr/sbin/init
5150
- name: rhel-7
5251
image: registry.access.redhat.com/ubi7/ubi:7.9
5352
dockerfile: ../common/Dockerfile.j2
5453
privileged: true
5554
volumes:
56-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
57-
command: "/usr/sbin/init"
55+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
56+
command: /usr/sbin/init
5857
- name: rhel-8
5958
image: registry.access.redhat.com/ubi8/ubi:8.5
6059
dockerfile: ../common/Dockerfile.j2
6160
privileged: true
6261
volumes:
63-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
64-
command: "/usr/sbin/init"
62+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
63+
command: /usr/sbin/init
6564
- name: rhel-9
6665
image: registry.access.redhat.com/ubi9/ubi:9.0.0
6766
dockerfile: ../common/Dockerfile.j2
6867
privileged: true
6968
volumes:
70-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
71-
command: "/usr/sbin/init"
69+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
70+
command: /usr/sbin/init
7271
- name: debian-buster
7372
image: debian:buster-slim
7473
dockerfile: ../common/Dockerfile.j2
7574
privileged: true
7675
volumes:
77-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
78-
command: "/sbin/init"
76+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
77+
command: /sbin/init
7978
- name: debian-bullseye
8079
image: debian:bullseye-slim
8180
dockerfile: ../common/Dockerfile.j2
8281
privileged: true
8382
volumes:
84-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
85-
command: "/sbin/init"
83+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
84+
command: /sbin/init
8685
- name: ubuntu-bionic
8786
image: ubuntu:bionic
8887
dockerfile: ../common/Dockerfile.j2
8988
privileged: true
9089
volumes:
91-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
92-
command: "/sbin/init"
90+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
91+
command: /sbin/init
9392
- name: ubuntu-focal
9493
image: ubuntu:focal
9594
dockerfile: ../common/Dockerfile.j2
9695
privileged: true
9796
volumes:
98-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
99-
command: "/sbin/init"
97+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
98+
command: /sbin/init
10099
- name: ubuntu-jammy
101100
image: ubuntu:jammy
102101
dockerfile: ../common/Dockerfile.j2
103102
privileged: true
104103
volumes:
105-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
106-
command: "/sbin/init"
104+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
105+
command: /sbin/init
107106
provisioner:
108107
name: ansible
109108
playbooks:

0 commit comments

Comments
 (0)