Fix yaml lint

debian_11
Emilien Mantel 2021-09-01 11:21:12 +02:00
parent bdddb06fcc
commit 6c7e0c2a47
18 changed files with 192 additions and 198 deletions

View File

@ -1,3 +1,5 @@
---
env: env:
- PLATFORM='docker-debian-stretch' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-debian-stretch' ANSIBLE_VERSION='ansible>=2.6,<2.7'
- PLATFORM='docker-debian-buster' ANSIBLE_VERSION='ansible>=2.6,<2.7' - PLATFORM='docker-debian-buster' ANSIBLE_VERSION='ansible>=2.6,<2.7'

6
.yamllint.yml 100644
View File

@ -0,0 +1,6 @@
---
extends: default
rules:
line-length: disable

View File

@ -1,4 +1,5 @@
--- ---
galaxy_info: galaxy_info:
author: Emilien Mantel author: Emilien Mantel
description: Nginx for Debian / FreeBSD description: Nginx for Debian / FreeBSD

View File

@ -7,7 +7,7 @@
- name: APT | Update cache - name: APT | Update cache
apt: apt:
update_cache: yes update_cache: true
cache_valid_time: 3600 cache_valid_time: 3600
changed_when: false changed_when: false
@ -41,7 +41,7 @@
git: git:
repo: 'https://github.com/Neilpang/acme.sh.git' repo: 'https://github.com/Neilpang/acme.sh.git'
dest: '{{ nginx_acmesh_git_dir }}' dest: '{{ nginx_acmesh_git_dir }}'
update: no update: false
version: master version: master
- name: COMMAND | Install acme.sh - name: COMMAND | Install acme.sh
@ -51,4 +51,3 @@
creates: "{{ nginx_acmesh_dir }}" creates: "{{ nginx_acmesh_dir }}"
when: not acme.stat.exists when: not acme.stat.exists

View File

@ -56,4 +56,4 @@
- name: SERVICE | Enable nginx - name: SERVICE | Enable nginx
service: service:
name: nginx name: nginx
enabled: yes enabled: true

View File

@ -6,7 +6,7 @@
executable: /bin/sh executable: /bin/sh
register: nginx_version register: nginx_version
changed_when: false changed_when: false
check_mode: no check_mode: false
tags: tags:
- skip_ansible_lint - skip_ansible_lint
@ -22,7 +22,7 @@
executable: /bin/sh executable: /bin/sh
register: shell_modules register: shell_modules
changed_when: false changed_when: false
check_mode: no check_mode: false
tags: tags:
- skip_ansible_lint - skip_ansible_lint

View File

@ -5,7 +5,7 @@
- name: STAT | Get info about DH file - name: STAT | Get info about DH file
stat: stat:
path: "{{ nginx_dh_path }}" path: "{{ nginx_dh_path }}"
get_checksum: no get_checksum: false
register: stat_dh_file register: stat_dh_file
- name: SHELL | Get info about DH file - name: SHELL | Get info about DH file
@ -56,8 +56,6 @@
notify: restart nginx notify: restart nginx
no_log: "{{ not nginx_debug_role }}" no_log: "{{ not nginx_debug_role }}"
- name: COMMAND | Create self-signed certificates - name: COMMAND | Create self-signed certificates
command: | command: |
openssl req openssl req

View File

@ -1,2 +1 @@
--- ---

View File

@ -1,2 +1 @@
--- ---

View File

@ -9,7 +9,7 @@
- name: APT | Install needed packages - name: APT | Install needed packages
apt: apt:
pkg: "{{ packages }}" pkg: "{{ packages }}"
update_cache: yes update_cache: true
cache_valid_time: 3600 cache_valid_time: 3600
state: present state: present
vars: vars:
@ -27,7 +27,7 @@
- name: APT | Install PHP - name: APT | Install PHP
apt: apt:
pkg: "{{ pkgs }}" pkg: "{{ pkgs }}"
update_cache: yes update_cache: true
cache_valid_time: 3600 cache_valid_time: 3600
state: present state: present
vars: vars:
@ -61,7 +61,7 @@
unarchive: unarchive:
src: "/tmp/ngrok.zip" src: "/tmp/ngrok.zip"
dest: "/tmp" dest: "/tmp"
remote_src: yes remote_src: true
- name: SET_FACT | ngrok_path - name: SET_FACT | ngrok_path
set_fact: set_fact:
@ -70,7 +70,7 @@
- name: USER | Create PHP User foo - name: USER | Create PHP User foo
user: user:
name: foo name: foo
system: yes system: true
- name: INCLUDE_ROLE | HanXHX.php - name: INCLUDE_ROLE | HanXHX.php
include_role: include_role:

View File

@ -17,8 +17,6 @@
sockets: sockets:
- host: '127.0.0.1' - host: '127.0.0.1'
port: 9000 port: 9000
# nginx_load_modules:
# - /usr/local/libexec/nginx/ngx_http_geoip_module.so
ngrok_path: '/usr/local/bin/ngrok' ngrok_path: '/usr/local/bin/ngrok'
- name: PKGNG | Install needed packages - name: PKGNG | Install needed packages
@ -30,22 +28,16 @@
- curl - curl
- daemonize - daemonize
- fcgiwrap - fcgiwrap
# - GeoIP
- jq - jq
- nghttp2 - nghttp2
- php74 - php74
- vim - vim
#- name: COMMAND | Get geoip database
# command: geoipupdate.sh
# args:
# creates: /usr/local/share/GeoIP/GeoIP.dat
- name: SERVICE | Force start services - name: SERVICE | Force start services
service: service:
name: "{{ item }}" name: "{{ item }}"
state: started state: started
enabled: yes enabled: true
register: sf register: sf
loop: loop:
- php-fpm - php-fpm

View File

@ -24,7 +24,7 @@
lineinfile: lineinfile:
line: "set mouse=" line: "set mouse="
dest: "{{ item }}/.vimrc" dest: "{{ item }}/.vimrc"
create: yes create: true
loop: loop:
- /root - /root
- /home/vagrant - /home/vagrant

View File

@ -39,12 +39,12 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
dest: "/etc/hosts" dest: "/etc/hosts"
unsafe_writes: yes unsafe_writes: true
vars: vars:
# Internal vars # Internal vars
int_ansible_ssl_dir: '/etc/ansible-ssl' int_ansible_ssl_dir: '/etc/ansible-ssl'
# Role vars # Role vars
nginx_worker_processes: 1 # Ansible+FreeBSD can't detect CPU number nginx_worker_processes: 1 # Ansible+FreeBSD can't detect CPU number
nginx_apt_package: 'nginx-extras' nginx_apt_package: 'nginx-extras'
nginx_module_packages: ['libnginx-mod-http-headers-more-filter'] nginx_module_packages: ['libnginx-mod-http-headers-more-filter']
@ -154,7 +154,7 @@
- 'test-alias.local' - 'test-alias.local'
- 'test2-alias.local' - 'test2-alias.local'
template: '_base' template: '_base'
filename : 'first-test' filename: 'first-test'
override_try_files: '$uri/ $uri =404' override_try_files: '$uri/ $uri =404'
headers: headers:
'X-Frame-Options': 'deny always' 'X-Frame-Options': 'deny always'
@ -283,15 +283,15 @@
roles: roles:
- ../../ - ../../
post_tasks: post_tasks:
# -------------------------------- # --------------------------------
# Apps # Apps
# -------------------------------- # --------------------------------
- name: INCLUDE_TASKS | Post_tasks related to OS version - name: INCLUDE_TASKS | Post_tasks related to OS version
include_tasks: "includes/post_{{ ansible_distribution }}.yml" include_tasks: "includes/post_{{ ansible_distribution }}.yml"
# -------------------------------- # --------------------------------
# Deploy index files # Deploy index files
# -------------------------------- # --------------------------------
- name: -- Add PHP file -- - name: -- Add PHP file --
copy: copy:
dest: "{{ nginx_root }}/{{ item }}/public/index.php" dest: "{{ nginx_root }}/{{ item }}/public/index.php"
@ -325,15 +325,16 @@
dest: "{{ nginx_root }}/test-htpasswd.local/public/hello/index.html" dest: "{{ nginx_root }}/test-htpasswd.local/public/hello/index.html"
content: "hello\n" content: "hello\n"
# -------------------------------- # --------------------------------
# Test custom facts # Test custom facts
# -------------------------------- # --------------------------------
- name: -- CHECK FACTS -- - name: -- CHECK FACTS --
assert: assert:
that: "'{{ ansible_local.nginx.fact_nginx_sites[0].name[0] }}' == 'test.local'" that: "'{{ ansible_local.nginx.fact_nginx_sites[0].name[0] }}' == 'test.local'"
# --------------------------------
# Simple sites tests # --------------------------------
# -------------------------------- # Simple sites tests
# --------------------------------
- name: -- VERIFY SITES -- - name: -- VERIFY SITES --
uri: uri:
url: "http://{{ item | nginx_site_name }}{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/" url: "http://{{ item | nginx_site_name }}{% if item.listen is defined %}:{{ item.listen[0] }}{% endif %}/"
@ -362,18 +363,18 @@
url: "https://{{ item.redirect_from[0] }}:{{ item.listen_ssl[0] | default(443) }}/" url: "https://{{ item.redirect_from[0] }}:{{ item.listen_ssl[0] | default(443) }}/"
status_code: 301 status_code: 301
follow_redirects: none follow_redirects: none
validate_certs: no validate_certs: false
loop: "{{ nginx_sites }}" loop: "{{ nginx_sites }}"
when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and item.proto is defined and 'https' in item.proto when: item.redirect_from is defined and (item.state is undefined or item.state != "absent") and item.proto is defined and 'https' in item.proto
changed_when: false changed_when: false
# -------------------------------- # --------------------------------
# PHP # PHP
# -------------------------------- # --------------------------------
- name: -- VERIFY PHP SITES -- - name: -- VERIFY PHP SITES --
uri: uri:
url: "http://{{ item.name }}/" url: "http://{{ item.name }}/"
return_content: yes return_content: true
register: p register: p
loop: "{{ nginx_sites }}" loop: "{{ nginx_sites }}"
when: > when: >
@ -384,13 +385,13 @@
- name: -- VERIFY INDEX2 -- - name: -- VERIFY INDEX2 --
uri: uri:
url: "http://test-php-index2.local/lorem.php?ipsum=sit&dolor=amet" url: "http://test-php-index2.local/lorem.php?ipsum=sit&dolor=amet"
return_content: yes return_content: true
register: p2 register: p2
failed_when: p2.content.find('PHP Version') == -1 failed_when: p2.content.find('PHP Version') == -1
# -------------------------------- # --------------------------------
# Basic Auth # Basic Auth
# -------------------------------- # --------------------------------
- name: -- VERIFY AUTH BASIC NONE -- - name: -- VERIFY AUTH BASIC NONE --
uri: uri:
url: "http://test-htpasswd.local/hello/" url: "http://test-htpasswd.local/hello/"
@ -402,14 +403,14 @@
status_code: 401 status_code: 401
user: "fail" user: "fail"
password: "fail" password: "fail"
force_basic_auth: yes force_basic_auth: true
- name: -- VERIFY AUTH BASIC OK -- - name: -- VERIFY AUTH BASIC OK --
uri: uri:
url: "http://test-htpasswd.local/hello/" url: "http://test-htpasswd.local/hello/"
user: "hanx" user: "hanx"
password: "qwerty" password: "qwerty"
force_basic_auth: yes force_basic_auth: true
- name: -- VERIFY AUTH BASIC FAIL GLOBAL -- - name: -- VERIFY AUTH BASIC FAIL GLOBAL --
uri: uri:
@ -417,23 +418,23 @@
status_code: 401 status_code: 401
user: "fail" user: "fail"
password: "fail" password: "fail"
force_basic_auth: yes force_basic_auth: true
- name: -- VERIFY AUTH BASIC OK GLOBAL -- - name: -- VERIFY AUTH BASIC OK GLOBAL --
uri: uri:
url: "http://test-htpasswd-all.local/" url: "http://test-htpasswd-all.local/"
user: "hanx" user: "hanx"
password: "qwerty" password: "qwerty"
force_basic_auth: yes force_basic_auth: true
# -------------------------------- # --------------------------------
# SSL # SSL
# -------------------------------- # --------------------------------
- name: -- VERIFY SSL -- - name: -- VERIFY SSL --
uri: uri:
url: "https://{{ item }}/" url: "https://{{ item }}/"
return_content: yes return_content: true
validate_certs: no validate_certs: false
register: sslok register: sslok
failed_when: sslok.content.find('Index HTML test OK') == -1 failed_when: sslok.content.find('Index HTML test OK') == -1
loop: loop:
@ -445,9 +446,9 @@
- name: -- VERIFY SSL REDIRECT -- - name: -- VERIFY SSL REDIRECT --
uri: uri:
url: "http://{{ item.name }}/" url: "http://{{ item.name }}/"
validate_certs: no validate_certs: false
status_code: 301 status_code: 301
return_content: yes return_content: true
follow_redirects: none follow_redirects: none
register: sslredirok register: sslredirok
failed_when: '"https://%s%s" % (item.name, ":" + item.port if item.port is defined else "") not in sslredirok.location' failed_when: '"https://%s%s" % (item.name, ":" + item.port if item.port is defined else "") not in sslredirok.location'
@ -458,13 +459,13 @@
- name: 'test-ssl-redirect-many2.local' - name: 'test-ssl-redirect-many2.local'
port: '8443' port: '8443'
# -------------------------------- # --------------------------------
# Default sites # Default sites
# -------------------------------- # --------------------------------
- name: -- VERIFY DEFAULT SITE -- - name: -- VERIFY DEFAULT SITE --
uri: uri:
url: 'http://127.0.0.1/' url: 'http://127.0.0.1/'
return_content: yes return_content: true
register: vdefault register: vdefault
failed_when: > failed_when: >
vdefault.content.find('Index HTML test OK') == -1 or vdefault.content.find('Index HTML test OK') == -1 or
@ -473,7 +474,7 @@
- name: -- VERIFY DEFAULT SITE + STUB STATUS-- - name: -- VERIFY DEFAULT SITE + STUB STATUS--
uri: uri:
url: 'http://127.0.0.1/status' url: 'http://127.0.0.1/status'
return_content: yes return_content: true
register: vdefault_status register: vdefault_status
failed_when: > failed_when: >
vdefault_status.content.find('Active connections') == -1 or vdefault_status.content.find('Active connections') == -1 or
@ -482,8 +483,8 @@
- name: -- VERIFY DEFAULT SSL SITE -- - name: -- VERIFY DEFAULT SSL SITE --
uri: uri:
url: 'https://127.0.0.1/' url: 'https://127.0.0.1/'
return_content: yes return_content: true
validate_certs: no validate_certs: false
register: vdefault register: vdefault
failed_when: > failed_when: >
vdefault.content.find('Index HTML test OK') == -1 or vdefault.content.find('Index HTML test OK') == -1 or
@ -492,55 +493,46 @@
- name: -- VERIFY NOT DEFAULT SITE -- - name: -- VERIFY NOT DEFAULT SITE --
uri: uri:
url: 'http://test-php.local/' url: 'http://test-php.local/'
return_content: yes return_content: true
register: vphp register: vphp
failed_when: vphp.x_ansible_default is defined failed_when: vphp.x_ansible_default is defined
- name: -- VERIFY NOT DEFAULT SSL SITE -- - name: -- VERIFY NOT DEFAULT SSL SITE --
uri: uri:
url: 'https://test-ssl.local/' url: 'https://test-ssl.local/'
return_content: yes return_content: true
validate_certs: no validate_certs: false
register: notdefaultssl register: notdefaultssl
failed_when: notdefaultssl.x_ansible_default is defined failed_when: notdefaultssl.x_ansible_default is defined
# --------------------------------
# -------------------------------- # Check Proxy protocol
# Check Proxy protocol # Note: Debian Stretch doesn't any version of curl with "--haproxy-protocol" argument
# -------------------------------- # --------------------------------
# Note: Debian Stretch doesn't any version of curl with "--haproxy-protocol" argument
- block: - block:
- name: SHELL | Check HTTP proxy protocol - name: SHELL | Check HTTP proxy protocol
shell: curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol' shell: curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol'
args: args:
executable: /bin/sh executable: /bin/sh
warn: no warn: false
changed_when: false changed_when: false
tags:
- skip_ansible_lint
- name: SHELL | Check HTTPS proxy protocol - name: SHELL | Check HTTPS proxy protocol
shell: curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol' shell: curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol'
args: args:
executable: /bin/sh executable: /bin/sh
warn: no warn: false
changed_when: false changed_when: false
tags:
- skip_ansible_lint
when: not (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', 'eq')) when: not (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', 'eq'))
# -------------------------------- # --------------------------------
# Check HTTP2 # Check HTTP2
# -------------------------------- # --------------------------------
- name: SHELL | Check HTTP2 - name: SHELL | Check HTTP2
shell: nghttp -nv https://localhost 2> /dev/null | grep -q h2 shell: nghttp -nv https://localhost 2> /dev/null | grep -q h2
args: args:
executable: /bin/sh executable: /bin/sh
changed_when: false changed_when: false
when: nginx_auto_config_httpv2 and 'http_v2' in nginx_modules when: nginx_auto_config_httpv2 and 'http_v2' in nginx_modules
tags:
- skip_ansible_lint

View File

@ -1,3 +1,5 @@
---
nginx_events_use: 'epoll' nginx_events_use: 'epoll'
nginx_pid: '/run/nginx.pid' nginx_pid: '/run/nginx.pid'
nginx_etc_dir: '/etc/nginx' nginx_etc_dir: '/etc/nginx'

View File

@ -1,3 +1,5 @@
---
nginx_events_use: 'kqueue' nginx_events_use: 'kqueue'
nginx_pid: '/var/run/nginx.pid' nginx_pid: '/var/run/nginx.pid'
nginx_etc_dir: '/usr/local/etc/nginx' nginx_etc_dir: '/usr/local/etc/nginx'

View File

@ -1,3 +1,5 @@
---
nginx_upstream_server_params: nginx_upstream_server_params:
- key: 'weight' - key: 'weight'
default: 1 default: 1