diff --git a/.travis.yml b/.travis.yml index e32c2b0..f46eb06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ env: global: - VAGRANT_VERSION='2.2.18' jobs: - - PLATFORM='docker-debian-stretch' ANSIBLE_VERSION='>=2.11,<2.12' - PLATFORM='docker-debian-bullseye' ANSIBLE_VERSION='>=2.11,<2.12' - PLATFORM='docker-debian-buster' ANSIBLE_VERSION='>=2.11,<2.12' diff --git a/README.md b/README.md index 453be97..883ad21 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Supported OS: | OS | Working | Stable (active support) | | -------------------- | ------- | ----------------------- | | Debian Jessie (8) | Yes | Check latest supported version ([1.5.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.5.0)) | -| Debian Stretch (9) | Yes | Yes | +| Debian Stretch (9) | Yes | Check latest supported version ([1.9.0](https://github.com/HanXHX/ansible-nginx/releases/tag/1.9.0)) | | Debian Buster (10) | Yes | Yes | | Debian Bullseye (11) | Yes | Yes | | FreeBSD 11 | Yes | No | diff --git a/Vagrantfile b/Vagrantfile index 1fed03f..8cf523b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,7 +6,6 @@ Vagrant.configure("2") do |config| vms_debian = [ - { :name => "debian-stretch", :box => "debian/stretch64", :vars => {} }, { :name => "debian-buster", :box => "debian/buster64", :vars => {} }, { :name => "debian-bullseye", :box => "debian/bullseye64", :vars => {} } ] @@ -17,7 +16,6 @@ Vagrant.configure("2") do |config| ] conts = [ - { :name => "docker-debian-stretch", :docker => "hanxhx/vagrant-ansible:debian9", :vars => {} }, { :name => "docker-debian-buster", :docker => "hanxhx/vagrant-ansible:debian10", :vars => {} }, { :name => "docker-debian-bullseye", :docker => "hanxhx/vagrant-ansible:debian11", :vars => {} }, ] diff --git a/meta/main.yml b/meta/main.yml index 62e54a9..01424b7 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,7 +11,6 @@ galaxy_info: platforms: - name: Debian versions: - - stretch - buster - bullseye - name: FreeBSD diff --git a/tests/includes/post_common.yml b/tests/includes/post_common.yml index 28dc38c..b7c29b5 100644 --- a/tests/includes/post_common.yml +++ b/tests/includes/post_common.yml @@ -239,25 +239,20 @@ # -------------------------------- # Check Proxy protocol -# Note: Debian Stretch doesn't any version of curl with "--haproxy-protocol" argument # -------------------------------- -- block: +- name: SHELL | Check HTTP proxy protocol + ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol' + args: + executable: /bin/bash + warn: false + changed_when: false - - name: SHELL | Check HTTP proxy protocol - ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol' - args: - executable: /bin/bash - warn: false - changed_when: false - - - name: SHELL | Check HTTPS proxy protocol - ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol' - args: - executable: /bin/bash - warn: false - changed_when: false - - when: not (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('9', 'eq')) +- name: SHELL | Check HTTPS proxy protocol + ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol' + args: + executable: /bin/bash + warn: false + changed_when: false # -------------------------------- # Check HTTP2