Skip to content

Commit 6945c6b

Browse files
alessfgalessfg
authored
Remove Yamllint (#265)
1 parent 893c571 commit 6945c6b

File tree

15 files changed

+60
-69
lines changed

15 files changed

+60
-69
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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ BUG FIXES:
1313

1414
Improve the NGINX main config defaults to bring them closer to the standard NGINX defaults on a fresh NGINX install.
1515

16+
TESTS:
17+
18+
* Remove Yamllint (Ansible Lint now incorporates Yamllint).
19+
* Skip Ansible Lint line length rule.
20+
1621
## 0.5.1 (April 6, 2022)
1722

1823
FEATURES:

‎defaults/main/upload.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# Upload NGINX config files/snippets.
66
nginx_config_upload_enable: false
77
nginx_config_upload:
8-
- src: config/snippets/ # You can optionally also include the specific file name
9-
dest: /etc/nginx/snippets # You can optionally also include the specific desired file name
8+
- src: config/snippets/ # You can optionally also include the specific file name
9+
dest: /etc/nginx/snippets # You can optionally also include the specific desired file name
1010
backup: true
1111
# Upload HTML files.
1212
nginx_config_upload_html_enable: false

‎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.11'
10+
min_ansible_version: "2.11"
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/cleanup_module/molecule.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,36 @@ driver:
77
name: docker
88
lint: |
99
set -e
10-
yamllint .
1110
ansible-lint --force-color
1211
platforms:
1312
- name: alpine-3.13
1413
image: alpine:3.13
1514
dockerfile: ../common/Dockerfile.j2
1615
privileged: true
1716
volumes:
18-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
19-
command: "/sbin/init"
17+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
18+
command: /sbin/init
2019
- name: centos-7
2120
image: centos:7
2221
dockerfile: ../common/Dockerfile.j2
2322
privileged: true
2423
volumes:
25-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
26-
command: "/usr/sbin/init"
24+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25+
command: /usr/sbin/init
2726
- name: debian-buster
2827
image: debian:buster-slim
2928
dockerfile: ../common/Dockerfile.j2
3029
privileged: true
3130
volumes:
32-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
33-
command: "/sbin/init"
31+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
32+
command: /sbin/init
3433
- name: ubuntu-bionic
3534
image: ubuntu:bionic
3635
dockerfile: ../common/Dockerfile.j2
3736
privileged: true
3837
volumes:
39-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
40-
command: "/sbin/init"
38+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
39+
command: /sbin/init
4140
provisioner:
4241
name: ansible
4342
playbooks:

‎molecule/default/converge.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
directio: false
147147
directio_alignment: 512
148148
disable_symlinks:
149-
check: 'on'
149+
check: "on"
150150
from: $document_root
151151
error_page:
152152
- code:
@@ -453,7 +453,7 @@
453453
always: false
454454
expires:
455455
modified: true
456-
time: "12h"
456+
time: 12h
457457
limit_req:
458458
limit_reqs:
459459
- zone: one
@@ -503,7 +503,7 @@
503503
- string: $http_user_agent
504504
variable: $isblockaccess_ua
505505
content:
506-
- value: "default"
506+
- value: default
507507
new_value: 0
508508
- value: '"~jndi:ldap"'
509509
new_value: 1
@@ -593,7 +593,7 @@
593593
alias: /
594594
limit_except:
595595
method: GET
596-
directive: "allow all"
596+
directive: allow all
597597
mirror:
598598
uri: /mirror
599599
proxy:
@@ -626,7 +626,7 @@
626626
- string: server_url
627627
replacement: $request_uri
628628
- string: remote_addr
629-
replacement: '$remote_addr:$remote_port'
629+
replacement: $remote_addr:$remote_port
630630
- string: server_date
631631
replacement: $time_local
632632
- string: client_browser
@@ -674,7 +674,7 @@
674674
- string: server_url
675675
replacement: $request_uri
676676
- string: remote_addr
677-
replacement: '$remote_addr:$remote_port'
677+
replacement: $remote_addr:$remote_port
678678
- string: server_date
679679
replacement: $time_local
680680
- string: client_browser

‎molecule/default/molecule.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,36 @@ driver:
77
name: docker
88
lint: |
99
set -e
10-
yamllint .
1110
ansible-lint --force-color
1211
platforms:
1312
- name: alpine-3.13
1413
image: alpine:3.13
1514
dockerfile: ../common/Dockerfile.j2
1615
privileged: true
1716
volumes:
18-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
19-
command: "/sbin/init"
17+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
18+
command: /sbin/init
2019
- name: centos-7
2120
image: centos:7
2221
dockerfile: ../common/Dockerfile.j2
2322
privileged: true
2423
volumes:
25-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
26-
command: "/usr/sbin/init"
24+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25+
command: /usr/sbin/init
2726
- name: debian-buster
2827
image: debian:buster-slim
2928
dockerfile: ../common/Dockerfile.j2
3029
privileged: true
3130
volumes:
32-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
33-
command: "/sbin/init"
31+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
32+
command: /sbin/init
3433
- name: ubuntu-bionic
3534
image: ubuntu:bionic
3635
dockerfile: ../common/Dockerfile.j2
3736
privileged: true
3837
volumes:
39-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
40-
command: "/sbin/init"
38+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
39+
command: /sbin/init
4140
provisioner:
4241
name: ansible
4342
playbooks:

‎molecule/default/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
- name: Ensure default.conf contains 'client_max_body_size 1m;'
9292
ansible.builtin.lineinfile:
9393
path: /etc/nginx/conf.d/default.conf
94-
line: "client_max_body_size 1m;"
94+
line: client_max_body_size 1m;
9595
state: present
9696
check_mode: true
9797
register: conf

‎molecule/plus/converge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
always: true
257257
expires:
258258
modified: true
259-
time: "12h"
259+
time: 12h
260260
limit_req:
261261
limit_reqs:
262262
- zone: one
@@ -299,7 +299,7 @@
299299
- string: $http_user_agent
300300
variable: $isblockaccess_ua
301301
content:
302-
- value: "default"
302+
- value: default
303303
new_value: 0
304304
- value: '"~jndi:ldap"'
305305
new_value: 1
@@ -561,7 +561,7 @@
561561
- string: server_url
562562
replacement: $request_uri
563563
- string: remote_addr
564-
replacement: '$remote_addr:$remote_port'
564+
replacement: $remote_addr:$remote_port
565565
- string: server_date
566566
replacement: $time_local
567567
- string: client_browser
@@ -601,7 +601,7 @@
601601
- string: server_url
602602
replacement: $request_uri
603603
- string: remote_addr
604-
replacement: '$remote_addr:$remote_port'
604+
replacement: $remote_addr:$remote_port
605605
- string: server_date
606606
replacement: $time_local
607607
- string: client_browser

0 commit comments

Comments
 (0)