From 57aee1fbc410b4ced7db5e144e06e62894e3aee2 Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Tue, 31 Aug 2021 11:05:00 +0200 Subject: [PATCH] Fix YAML linter --- .yamllint.yml | 6 ++++++ tests/includes/pre_Debian.yml | 2 +- tests/test.yml | 28 ++++++++++++++-------------- vars/Debian-bullseye.yml | 2 ++ vars/Debian-buster.yml | 2 ++ vars/Debian-stretch.yml | 2 ++ vars/FreeBSD-11.yml | 2 ++ vars/FreeBSD-12.yml | 2 ++ vars/Ubuntu-bionic.yml | 2 ++ vars/Ubuntu-xenial.yml | 2 ++ 10 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 .yamllint.yml diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000..53974a0 --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,6 @@ +--- + +extends: default + +rules: + line-length: disable diff --git a/tests/includes/pre_Debian.yml b/tests/includes/pre_Debian.yml index 00ffada..a9add58 100644 --- a/tests/includes/pre_Debian.yml +++ b/tests/includes/pre_Debian.yml @@ -7,7 +7,7 @@ - name: APT | Install packages apt: pkg: "{{ p }}" - update_cache: yes + update_cache: true cache_valid_time: 3600 vars: p: diff --git a/tests/test.yml b/tests/test.yml index a71b1ab..477e946 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -37,8 +37,8 @@ - name: USER | Create PHP user user: name: 'foo' - system: yes - create_home: no + system: true + create_home: false shell: '/usr/sbin/nologin' tasks: @@ -70,19 +70,19 @@ - block: - - name: COMMAND | Docker nginx status - command: service nginx status - args: - warn: false - changed_when: false - failed_when: false - register: ngs + - name: COMMAND | Docker nginx status + command: service nginx status + args: + warn: false + changed_when: false + failed_when: false + register: ngs - - name: COMMAND | Docker start nginx - command: service nginx start - args: - warn: false - when: ngs.stdout.find('nginx is not running') != -1 + - name: COMMAND | Docker start nginx + command: service nginx start + args: + warn: false + when: ngs.stdout.find('nginx is not running') != -1 when: ansible_virtualization_type == 'docker' diff --git a/vars/Debian-bullseye.yml b/vars/Debian-bullseye.yml index aeb930d..46567b9 100644 --- a/vars/Debian-bullseye.yml +++ b/vars/Debian-bullseye.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.4' diff --git a/vars/Debian-buster.yml b/vars/Debian-buster.yml index 7733368..0ac2956 100644 --- a/vars/Debian-buster.yml +++ b/vars/Debian-buster.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.3' diff --git a/vars/Debian-stretch.yml b/vars/Debian-stretch.yml index ba02b4c..7712f6a 100644 --- a/vars/Debian-stretch.yml +++ b/vars/Debian-stretch.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.0' diff --git a/vars/FreeBSD-11.yml b/vars/FreeBSD-11.yml index ebebaae..23ec322 100644 --- a/vars/FreeBSD-11.yml +++ b/vars/FreeBSD-11.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.2' diff --git a/vars/FreeBSD-12.yml b/vars/FreeBSD-12.yml index ebebaae..23ec322 100644 --- a/vars/FreeBSD-12.yml +++ b/vars/FreeBSD-12.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.2' diff --git a/vars/Ubuntu-bionic.yml b/vars/Ubuntu-bionic.yml index ebebaae..23ec322 100644 --- a/vars/Ubuntu-bionic.yml +++ b/vars/Ubuntu-bionic.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.2' diff --git a/vars/Ubuntu-xenial.yml b/vars/Ubuntu-xenial.yml index ba02b4c..7712f6a 100644 --- a/vars/Ubuntu-xenial.yml +++ b/vars/Ubuntu-xenial.yml @@ -1 +1,3 @@ +--- + php_default_version: '7.0'