From 2a23743fca8fd54b2a18dc2a07d0daa8142c0289 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 2 Feb 2021 00:20:41 +0000 Subject: [PATCH 01/45] ci(pre-commit): update hook for `rubocop` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/290 --- .pre-commit-config.yaml | 2 +- CODEOWNERS | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 136e470..3658fb2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: files: ^.*\.(sh|bash|ksh)$ types: [] args: [] - - repo: https://github.com/adrienverge/yamllint.git + - repo: https://github.com/adrienverge/yamllint rev: v1.23.0 hooks: - id: yamllint diff --git a/CODEOWNERS b/CODEOWNERS index 05c8e5d..e09bf98 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -15,8 +15,11 @@ /docs/AUTHORS.rst @saltstack-formulas/ssf /docs/CHANGELOG.rst @saltstack-formulas/ssf /docs/TOFS_pattern.rst @saltstack-formulas/ssf +/*/_mapdata/ @saltstack-formulas/ssf /*/libsaltcli.jinja @saltstack-formulas/ssf /*/libtofs.jinja @saltstack-formulas/ssf +/test/integration/**/_mapdata_spec.rb @saltstack-formulas/ssf +/test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf From 502e45b02f1509a51773cbe2718fcc2703660e83 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 11 Feb 2021 11:51:21 +0000 Subject: [PATCH 02/45] chore: standardise structure (`.gitignore` & `_mapdata.rb`) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/292 --- .gitignore | 11 +++++++++++ CODEOWNERS | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6995110..94f77a8 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,9 @@ celerybeat-schedule venv/ ENV/ +# visual studio +.vs/ + # Spyder project settings .spyderproject .spyproject @@ -120,3 +123,11 @@ docs/*.md Dockerfile.*_* ignore/ tmp/ + +# `salt-formula` -- Vagrant Specific files +.vagrant +top.sls + +# `suricata-formula` -- Platform binaries +*.rpm +*.deb diff --git a/CODEOWNERS b/CODEOWNERS index e09bf98..ad24c19 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -18,7 +18,7 @@ /*/_mapdata/ @saltstack-formulas/ssf /*/libsaltcli.jinja @saltstack-formulas/ssf /*/libtofs.jinja @saltstack-formulas/ssf -/test/integration/**/_mapdata_spec.rb @saltstack-formulas/ssf +/test/integration/**/_mapdata.rb @saltstack-formulas/ssf /test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf From ae6375ccccd56a506ee28babbeabf351112a06de Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 14 Feb 2021 08:01:26 +0000 Subject: [PATCH 03/45] fix(pkg): add inline EPEL repo configuration for Amazon Linux 2 --- nginx/pkg.sls | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nginx/pkg.sls b/nginx/pkg.sls index 11d91ec..3fd8434 100644 --- a/nginx/pkg.sls +++ b/nginx/pkg.sls @@ -113,6 +113,22 @@ nginx_zypp_repo: {% endif %} {% if salt['grains.get']('os_family') == 'RedHat' %} +{% if salt['grains.get']('osfinger', '') in ['Amazon Linux-2'] %} +nginx_epel_repo: + pkgrepo.managed: + - name: epel + - humanname: Extra Packages for Enterprise Linux 7 - $basearch + - mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch + - enabled: 1 + - gpgcheck: 1 + - gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 + - failovermethod: priority + - require_in: + - pkg: nginx_install + - watch_in: + - pkg: nginx_install +{% endif %} + nginx_yum_repo: pkgrepo: {%- if from_official %} From ab39c8f7c3c9bf5dbd4436cad8ccce21263fe646 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 14 Feb 2021 08:22:55 +0000 Subject: [PATCH 04/45] test(config): fix for Amazon Linux 2 & Oracle Linux 7/8 --- test/integration/default/controls/config.rb | 8 ++++---- test/integration/default/controls/service.rb | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index fb7d69c..a01ef3b 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -3,12 +3,12 @@ server_available = '/etc/nginx/sites-available' server_enabled = '/etc/nginx/sites-enabled' -# Override by OS -case os[:name] -when 'redhat', 'centos', 'fedora' +# Override by platform family +case platform[:family] +when 'redhat','fedora' server_available = '/etc/nginx/conf.d' server_enabled = '/etc/nginx/conf.d' -when 'opensuse' +when 'suse' server_available = '/etc/nginx/vhosts.d' server_enabled = '/etc/nginx/vhosts.d' end diff --git a/test/integration/default/controls/service.rb b/test/integration/default/controls/service.rb index 5dad48c..c979d24 100644 --- a/test/integration/default/controls/service.rb +++ b/test/integration/default/controls/service.rb @@ -2,6 +2,7 @@ control 'Nginx service' do title 'should be running and enabled' describe service('nginx') do + it { should be_installed } it { should be_enabled } it { should be_running } end From b4411c61d3352ecb9775197f991f5f33996730dc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 14 Feb 2021 08:06:26 +0000 Subject: [PATCH 05/45] ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/293 --- .gitlab-ci.yml | 102 +++++++--- .travis.yml | 102 +++++++--- kitchen.yml | 294 +++++++++++++++++++++------- test/integration/default/inspec.yml | 3 + 4 files changed, 375 insertions(+), 126 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f263f1..aa9ae50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,35 +123,81 @@ rubocop: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` +# default-debian-10-tiamat-py3: {extends: '.test_instance'} +# default-debian-9-tiamat-py3: {extends: '.test_instance'} +# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} +# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} +# default-centos-8-tiamat-py3: {extends: '.test_instance'} +# default-centos-7-tiamat-py3: {extends: '.test_instance'} +# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} +# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} +# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} default-debian-10-master-py3: {extends: '.test_instance'} -# default-ubuntu-1804-master-py3: {extends: '.test_instance'} -# default-centos-8-master-py3: {extends: '.test_instance'} -# default-fedora-31-master-py3: {extends: '.test_instance'} -# default-opensuse-leap-151-master-py3: {extends: '.test_instance'} -# default-amazonlinux-2-master-py3: {extends: '.test_instance'} -# default-debian-10-2019-2-py3: {extends: '.test_instance'} -# default-debian-9-2019-2-py3: {extends: '.test_instance'} -default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} -default-centos-8-2019-2-py3: {extends: '.test_instance'} -# default-fedora-31-2019-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'} -# default-centos-7-2019-2-py2: {extends: '.test_instance'} -# default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'} -default-arch-base-latest-2019-2-py2: {extends: '.test_instance'} -default-fedora-30-2018-3-py3: {extends: '.test_instance'} -# default-debian-9-2018-3-py2: {extends: '.test_instance'} -# default-ubuntu-1604-2018-3-py2: {extends: '.test_instance'} -# default-centos-7-2018-3-py2: {extends: '.test_instance'} -default-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'} -# default-amazonlinux-1-2018-3-py2: {extends: '.test_instance'} -# default-arch-base-latest-2018-3-py2: {extends: '.test_instance'} -# default-debian-8-2017-7-py2: {extends: '.test_instance'} -# default-ubuntu-1604-2017-7-py2: {extends: '.test_instance'} -# default-centos-6-2017-7-py2: {extends: '.test_instance'} -# default-fedora-30-2017-7-py2: {extends: '.test_instance'} -# default-opensuse-leap-151-2017-7-py2: {extends: '.test_instance'} -# default-amazonlinux-1-2017-7-py2: {extends: '.test_instance'} -# default-arch-base-latest-2017-7-py2: {extends: '.test_instance'} +default-debian-9-master-py3: {extends: '.test_instance'} +default-ubuntu-2004-master-py3: {extends: '.test_instance'} +default-ubuntu-1804-master-py3: {extends: '.test_instance'} +default-ubuntu-1604-master-py3: {extends: '.test_instance'} +default-centos-8-master-py3: {extends: '.test_instance'} +default-centos-7-master-py3: {extends: '.test_instance'} +default-fedora-33-master-py3: {extends: '.test_instance'} +default-fedora-32-master-py3: {extends: '.test_instance'} +default-opensuse-leap-152-master-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +default-amazonlinux-2-master-py3: {extends: '.test_instance'} +default-oraclelinux-8-master-py3: {extends: '.test_instance'} +default-oraclelinux-7-master-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} +default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} +# default-debian-10-3002-2-py3: {extends: '.test_instance'} +# default-debian-9-3002-2-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'} +# default-centos-8-3002-2-py3: {extends: '.test_instance'} +# default-centos-7-3002-2-py3: {extends: '.test_instance'} +# default-fedora-33-3002-2-py3: {extends: '.test_instance'} +# default-fedora-32-3002-2-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'} +default-arch-base-latest-3002-2-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'} +# default-debian-10-3001-4-py3: {extends: '.test_instance'} +# default-debian-9-3001-4-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'} +# default-centos-8-3001-4-py3: {extends: '.test_instance'} +# default-centos-7-3001-4-py3: {extends: '.test_instance'} +# default-fedora-33-3001-4-py3: {extends: '.test_instance'} +# default-fedora-32-3001-4-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'} +# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'} +# default-debian-10-3000-6-py3: {extends: '.test_instance'} +# default-debian-9-3000-6-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'} +# default-centos-8-3000-6-py3: {extends: '.test_instance'} +# default-centos-7-3000-6-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} +# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} +# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 0110ed0..3a8f1ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,35 +94,81 @@ jobs: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` + # - env: INSTANCE=default-debian-10-tiamat-py3 + # - env: INSTANCE=default-debian-9-tiamat-py3 + # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 + # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=default-ubuntu-1604-tiamat-py3 + # - env: INSTANCE=default-centos-8-tiamat-py3 + # - env: INSTANCE=default-centos-7-tiamat-py3 + # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 + # - env: INSTANCE=default-oraclelinux-8-tiamat-py3 + # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 - env: INSTANCE=default-debian-10-master-py3 - # - env: INSTANCE=default-ubuntu-1804-master-py3 - # - env: INSTANCE=default-centos-8-master-py3 - # - env: INSTANCE=default-fedora-31-master-py3 - # - env: INSTANCE=default-opensuse-leap-151-master-py3 - # - env: INSTANCE=default-amazonlinux-2-master-py3 - # - env: INSTANCE=default-debian-10-2019-2-py3 - # - env: INSTANCE=default-debian-9-2019-2-py3 - - env: INSTANCE=default-ubuntu-1804-2019-2-py3 - - env: INSTANCE=default-centos-8-2019-2-py3 - # - env: INSTANCE=default-fedora-31-2019-2-py3 - # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 - # - env: INSTANCE=default-centos-7-2019-2-py2 - # - env: INSTANCE=default-amazonlinux-2-2019-2-py3 - - env: INSTANCE=default-arch-base-latest-2019-2-py2 - - env: INSTANCE=default-fedora-30-2018-3-py3 - # - env: INSTANCE=default-debian-9-2018-3-py2 - # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 - # - env: INSTANCE=default-centos-7-2018-3-py2 - - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 - # - env: INSTANCE=default-amazonlinux-1-2018-3-py2 - # - env: INSTANCE=default-arch-base-latest-2018-3-py2 - # - env: INSTANCE=default-debian-8-2017-7-py2 - # - env: INSTANCE=default-ubuntu-1604-2017-7-py2 - # - env: INSTANCE=default-centos-6-2017-7-py2 - # - env: INSTANCE=default-fedora-30-2017-7-py2 - # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2 - # - env: INSTANCE=default-amazonlinux-1-2017-7-py2 - # - env: INSTANCE=default-arch-base-latest-2017-7-py2 + - env: INSTANCE=default-debian-9-master-py3 + - env: INSTANCE=default-ubuntu-2004-master-py3 + - env: INSTANCE=default-ubuntu-1804-master-py3 + - env: INSTANCE=default-ubuntu-1604-master-py3 + - env: INSTANCE=default-centos-8-master-py3 + - env: INSTANCE=default-centos-7-master-py3 + - env: INSTANCE=default-fedora-33-master-py3 + - env: INSTANCE=default-fedora-32-master-py3 + - env: INSTANCE=default-opensuse-leap-152-master-py3 + - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 + - env: INSTANCE=default-amazonlinux-2-master-py3 + - env: INSTANCE=default-oraclelinux-8-master-py3 + - env: INSTANCE=default-oraclelinux-7-master-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 + - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 + # - env: INSTANCE=default-debian-10-3002-2-py3 + # - env: INSTANCE=default-debian-9-3002-2-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-2-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-2-py3 + # - env: INSTANCE=default-ubuntu-1604-3002-2-py3 + # - env: INSTANCE=default-centos-8-3002-2-py3 + # - env: INSTANCE=default-centos-7-3002-2-py3 + # - env: INSTANCE=default-fedora-33-3002-2-py3 + # - env: INSTANCE=default-fedora-32-3002-2-py3 + # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-2-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-2-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-2-py3 + - env: INSTANCE=default-arch-base-latest-3002-2-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3 + # - env: INSTANCE=default-debian-10-3001-4-py3 + # - env: INSTANCE=default-debian-9-3001-4-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-4-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-4-py3 + # - env: INSTANCE=default-ubuntu-1604-3001-4-py3 + # - env: INSTANCE=default-centos-8-3001-4-py3 + # - env: INSTANCE=default-centos-7-3001-4-py3 + # - env: INSTANCE=default-fedora-33-3001-4-py3 + # - env: INSTANCE=default-fedora-32-3001-4-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-4-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-4-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-4-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-4-py3 + # - env: INSTANCE=default-arch-base-latest-3001-4-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3 + # - env: INSTANCE=default-debian-10-3000-6-py3 + # - env: INSTANCE=default-debian-9-3000-6-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-6-py3 + # - env: INSTANCE=default-ubuntu-1604-3000-6-py3 + # - env: INSTANCE=default-centos-8-3000-6-py3 + # - env: INSTANCE=default-centos-7-3000-6-py3 + # - env: INSTANCE=default-opensuse-leap-152-3000-6-py3 + # - env: INSTANCE=default-amazonlinux-2-3000-6-py3 + # - env: INSTANCE=default-oraclelinux-8-3000-6-py3 + # - env: INSTANCE=default-oraclelinux-7-3000-6-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-6-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-6-py2 + # - env: INSTANCE=default-arch-base-latest-3000-6-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 6ea5972..c1c11b9 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -8,128 +8,282 @@ driver: privileged: true run_command: /lib/systemd/systemd -# Make sure the platforms listed below match up with -# the `env.matrix` instances defined in `.travis.yml` platforms: + ## SALT `tiamat` + - name: debian-10-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-10 + - name: debian-9-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-9 + - name: ubuntu-2004-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-20.04 + - name: ubuntu-1804-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-18.04 + - name: ubuntu-1604-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-16.04 + - name: centos-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-8 + - name: centos-7-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-7 + - name: amazonlinux-2-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:amazonlinux-2 + - name: oraclelinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:oraclelinux-8 + - name: oraclelinux-7-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:oraclelinux-7 + ## SALT `master` - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 + - name: debian-9-master-py3 + driver: + image: saltimages/salt-master-py3:debian-9 + - name: ubuntu-2004-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-20.04 - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 + - name: ubuntu-1604-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-16.04 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 - - name: fedora-31-master-py3 + - name: centos-7-master-py3 driver: - image: saltimages/salt-master-py3:fedora-31 - - name: opensuse-leap-151-master-py3 + image: saltimages/salt-master-py3:centos-7 + - name: fedora-33-master-py3 driver: - image: netmanagers/salt-master-py3:opensuse-leap-15.1 + image: saltimages/salt-master-py3:fedora-33 + - name: fedora-32-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-32 + - name: opensuse-leap-152-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - name: amazonlinux-2-master-py3 driver: image: saltimages/salt-master-py3:amazonlinux-2 + - name: oraclelinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:oraclelinux-8 + - name: oraclelinux-7-master-py3 + driver: + image: saltimages/salt-master-py3:oraclelinux-7 + - name: gentoo-stage3-latest-master-py3 + driver: + image: saltimages/salt-master-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-master-py3 + driver: + image: saltimages/salt-master-py3:gentoo-stage3-systemd - ## SALT `2019.2` - - name: debian-10-2019-2-py3 + ## SALT `3002.2` + - name: debian-10-3002-2-py3 driver: - image: saltimages/salt-2019.2-py3:debian-10 - - name: debian-9-2019-2-py3 + image: saltimages/salt-3002.2-py3:debian-10 + - name: debian-9-3002-2-py3 driver: - image: saltimages/salt-2019.2-py3:debian-9 - - name: ubuntu-1804-2019-2-py3 + image: saltimages/salt-3002.2-py3:debian-9 + - name: ubuntu-2004-3002-2-py3 driver: - image: saltimages/salt-2019.2-py3:ubuntu-18.04 - - name: centos-8-2019-2-py3 + image: saltimages/salt-3002.2-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-2-py3 driver: - image: saltimages/salt-2019.2-py3:centos-8 - - name: fedora-31-2019-2-py3 + image: saltimages/salt-3002.2-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-2-py3 driver: - image: saltimages/salt-2019.2-py3:fedora-31 - - name: opensuse-leap-151-2019-2-py3 + image: saltimages/salt-3002.2-py3:ubuntu-16.04 + - name: centos-8-3002-2-py3 driver: - image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 + image: saltimages/salt-3002.2-py3:centos-8 + - name: centos-7-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:centos-7 + - name: fedora-33-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:fedora-33 + - name: fedora-32-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:fedora-32 + - name: opensuse-leap-152-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: centos-7-2019-2-py2 + - name: opensuse-tmbl-latest-3002-2-py3 driver: - image: netmanagers/salt-2019.2-py2:centos-7 - - name: amazonlinux-2-2019-2-py3 - driver: - image: saltimages/salt-2019.2-py3:amazonlinux-2 - - name: arch-base-latest-2019-2-py2 - driver: - image: saltimages/salt-2019.2-py2:arch-base-latest + image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest run_command: /usr/lib/systemd/systemd - - ## SALT `2018.3` - - name: fedora-30-2018-3-py3 - driver: - image: netmanagers/salt-2018.3-py3:fedora-30 - - name: debian-9-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:debian-9 - - name: ubuntu-1604-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:ubuntu-16.04 - - name: centos-7-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:centos-7 - - name: opensuse-leap-151-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1 - run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-1-2018-3-py2 + - name: amazonlinux-2-3002-2-py3 driver: - image: netmanagers/salt-2018.3-py2:amazonlinux-1 - run_command: /sbin/init - - name: arch-base-latest-2018-3-py2 + image: saltimages/salt-3002.2-py3:amazonlinux-2 + - name: oraclelinux-8-3002-2-py3 driver: - image: netmanagers/salt-2018.3-py2:arch-base-latest + image: saltimages/salt-3002.2-py3:oraclelinux-8 + - name: oraclelinux-7-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:oraclelinux-7 + - name: arch-base-latest-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:arch-base-latest run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd - ## SALT `2017.7` - - name: debian-8-2017-7-py2 + ## SALT `3001.4` + - name: debian-10-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:debian-8 - - name: ubuntu-1604-2017-7-py2 + image: saltimages/salt-3001.4-py3:debian-10 + - name: debian-9-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:ubuntu-16.04 - - name: centos-6-2017-7-py2 + image: saltimages/salt-3001.4-py3:debian-9 + - name: ubuntu-2004-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:centos-6 - run_command: /sbin/init - - name: fedora-30-2017-7-py2 + image: saltimages/salt-3001.4-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:fedora-30 - - name: opensuse-leap-151-2017-7-py2 + image: saltimages/salt-3001.4-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1 + image: saltimages/salt-3001.4-py3:ubuntu-16.04 + - name: centos-8-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:centos-8 + - name: centos-7-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:centos-7 + - name: fedora-33-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:fedora-33 + - name: fedora-32-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:fedora-32 + - name: opensuse-leap-152-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-1-2017-7-py2 + - name: opensuse-tmbl-latest-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:amazonlinux-1 + image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:amazonlinux-2 + - name: oraclelinux-8-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:oraclelinux-8 + - name: oraclelinux-7-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:oraclelinux-7 + - name: arch-base-latest-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:gentoo-stage3-latest run_command: /sbin/init - - name: arch-base-latest-2017-7-py2 + - name: gentoo-stage3-systemd-3001-4-py3 driver: - image: netmanagers/salt-2017.7-py2:arch-base-latest + image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd + + ## SALT `3000.6` + - name: debian-10-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:debian-10 + - name: debian-9-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:debian-9 + - name: ubuntu-1804-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:ubuntu-16.04 + - name: centos-8-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:centos-8 + - name: centos-7-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:centos-7 + - name: opensuse-leap-152-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:opensuse-leap-15.2 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:amazonlinux-2 + - name: oraclelinux-8-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:oraclelinux-8 + - name: oraclelinux-7-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd + - name: ubuntu-1804-3000-6-py2 + driver: + image: saltimages/salt-3000.6-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-6-py2 + driver: + image: saltimages/salt-3000.6-py2:ubuntu-16.04 + - name: arch-base-latest-3000-6-py2 + driver: + image: saltimages/salt-3000.6-py2:arch-base-latest run_command: /usr/lib/systemd/systemd provisioner: diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index bd6a065..8647404 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -15,4 +15,7 @@ supports: - platform-name: suse - platform-name: freebsd - platform-name: amazon + - platform-name: oracle - platform-name: arch + - platform-name: gentoo + - platform: windows From 123d13e2f483c203cbfc1366b36a30e1732603e1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 17 Feb 2021 13:51:30 +0000 Subject: [PATCH 06/45] ci(gemfile+lock): use `ssf` customised `kitchen-docker` repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/294 --- Gemfile | 4 +++- Gemfile.lock | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 82c4a31..15a77c3 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ source 'https://rubygems.org' gem 'inspec', '~> 4.22.22' # Install the `kitchen-docker` gem from GitHub because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. -gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +# rubocop:disable Layout/LineLength +gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' +# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 19bf26d..d7cbc3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/test-kitchen/kitchen-docker.git - revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 - ref: 41e80fe + remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker + revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + branch: ssf specs: kitchen-docker (2.10.0) test-kitchen (>= 1.0.0) From cd60912213f0ab152089ede46b0180bc9ee858d9 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 21 Feb 2021 08:31:53 +0000 Subject: [PATCH 07/45] chore(shellcheck): switch hook for `shellcheck` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/295 --- .pre-commit-config.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3658fb2..53a837e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,14 +17,13 @@ repos: stages: [manual] additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true - - repo: https://github.com/jumanjihouse/pre-commit-hooks - rev: 2.1.3 + - repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.7.1.1 hooks: - id: shellcheck name: Check shell scripts with shellcheck files: ^.*\.(sh|bash|ksh)$ types: [] - args: [] - repo: https://github.com/adrienverge/yamllint rev: v1.23.0 hooks: From e2bab407611109adeac804d518fd25db3393ca71 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Tue, 23 Feb 2021 21:49:24 +0000 Subject: [PATCH 08/45] chore(rubocop): allow use of `YAML.load` for `_mapdata.rb` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/296 --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 7fd75ac..9367e99 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -12,5 +12,8 @@ Metrics/BlockLength: - describe # Increase from default of `25` Max: 30 +Security/YAMLLoad: + Exclude: + - test/integration/**/_mapdata.rb # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` From 6dfe33e4ad4e5cee8c7464c87f541a4475966fd7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 5 Mar 2021 18:33:28 +0000 Subject: [PATCH 09/45] chore(yamllint): add `.git/` to ignores [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/297 --- .yamllint | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.yamllint b/.yamllint index 73bcbe2..5a060ef 100644 --- a/.yamllint +++ b/.yamllint @@ -2,14 +2,17 @@ # vim: ft=yaml --- # Extend the `default` configuration provided by `yamllint` -extends: default +extends: 'default' # Files to ignore completely -# 1. All YAML files under directory `node_modules/`, introduced during the Travis run -# 2. Any SLS files under directory `test/`, which are actually state files -# 3. Any YAML files under directory `.kitchen/`, introduced during local testing +# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run +# 2. All YAML files under directory `.git/` +# 3. All YAML files under directory `node_modules/`, introduced during the Travis run +# 4. Any SLS files under directory `test/`, which are actually state files +# 5. Any YAML files under directory `.kitchen/`, introduced during local testing ignore: | .cache/ + .git/ node_modules/ test/**/states/**/*.sls .kitchen/ From 63d32a40b13ca2c77bb83cceba620218617aab6a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 7 Mar 2021 22:20:22 +0000 Subject: [PATCH 10/45] ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/299 --- .gitlab-ci.yml | 96 ++++++++++----------- .travis.yml | 94 ++++++++++---------- kitchen.yml | 228 +++++++++++++++++++++++++------------------------ 3 files changed, 210 insertions(+), 208 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa9ae50..e18d4bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ variables: DOCKER_DRIVER: 'overlay2' ############################################################################### -# `lint` stage: `commitlint` & `pre-commit` +# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed) ############################################################################### commitlint: stage: *stage_lint @@ -149,55 +149,55 @@ default-oraclelinux-8-master-py3: {extends: '.test_instance'} default-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} -# default-debian-10-3002-2-py3: {extends: '.test_instance'} -# default-debian-9-3002-2-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3002-2-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3002-2-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3002-2-py3: {extends: '.test_instance'} -# default-centos-8-3002-2-py3: {extends: '.test_instance'} -# default-centos-7-3002-2-py3: {extends: '.test_instance'} -# default-fedora-33-3002-2-py3: {extends: '.test_instance'} -# default-fedora-32-3002-2-py3: {extends: '.test_instance'} +# default-debian-10-3002-5-py3: {extends: '.test_instance'} +# default-debian-9-3002-5-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} +# default-centos-8-3002-5-py3: {extends: '.test_instance'} +# default-centos-7-3002-5-py3: {extends: '.test_instance'} +# default-fedora-33-3002-5-py3: {extends: '.test_instance'} +# default-fedora-32-3002-5-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'} +default-arch-base-latest-3002-5-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3002-2-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3002-2-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3002-2-py3: {extends: '.test_instance'} -default-arch-base-latest-3002-2-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'} -# default-debian-10-3001-4-py3: {extends: '.test_instance'} -# default-debian-9-3001-4-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3001-4-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3001-4-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3001-4-py3: {extends: '.test_instance'} -# default-centos-8-3001-4-py3: {extends: '.test_instance'} -# default-centos-7-3001-4-py3: {extends: '.test_instance'} -# default-fedora-33-3001-4-py3: {extends: '.test_instance'} -# default-fedora-32-3001-4-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-4-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3001-4-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3001-4-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3001-4-py3: {extends: '.test_instance'} -# default-arch-base-latest-3001-4-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'} -# default-debian-10-3000-6-py3: {extends: '.test_instance'} -# default-debian-9-3000-6-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-6-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3000-6-py3: {extends: '.test_instance'} -# default-centos-8-3000-6-py3: {extends: '.test_instance'} -# default-centos-7-3000-6-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3000-6-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3000-6-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3000-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} -# default-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} -# default-arch-base-latest-3000-6-py2: {extends: '.test_instance'} +# default-debian-10-3001-6-py3: {extends: '.test_instance'} +# default-debian-9-3001-6-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} +# default-centos-8-3001-6-py3: {extends: '.test_instance'} +# default-centos-7-3001-6-py3: {extends: '.test_instance'} +# default-fedora-33-3001-6-py3: {extends: '.test_instance'} +# default-fedora-32-3001-6-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'} +# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} +# default-debian-10-3000-8-py3: {extends: '.test_instance'} +# default-debian-9-3000-8-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} +# default-centos-8-3000-8-py3: {extends: '.test_instance'} +# default-centos-7-3000-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} +# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} +# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 3a8f1ef..b33ce7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,55 +120,55 @@ jobs: - env: INSTANCE=default-oraclelinux-7-master-py3 # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 - # - env: INSTANCE=default-debian-10-3002-2-py3 - # - env: INSTANCE=default-debian-9-3002-2-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-2-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-2-py3 - # - env: INSTANCE=default-ubuntu-1604-3002-2-py3 - # - env: INSTANCE=default-centos-8-3002-2-py3 - # - env: INSTANCE=default-centos-7-3002-2-py3 - # - env: INSTANCE=default-fedora-33-3002-2-py3 - # - env: INSTANCE=default-fedora-32-3002-2-py3 + # - env: INSTANCE=default-debian-10-3002-5-py3 + # - env: INSTANCE=default-debian-9-3002-5-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-5-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-5-py3 + # - env: INSTANCE=default-ubuntu-1604-3002-5-py3 + # - env: INSTANCE=default-centos-8-3002-5-py3 + # - env: INSTANCE=default-centos-7-3002-5-py3 + # - env: INSTANCE=default-fedora-33-3002-5-py3 + # - env: INSTANCE=default-fedora-32-3002-5-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-5-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-5-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-5-py3 + - env: INSTANCE=default-arch-base-latest-3002-5-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-2-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-2-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-2-py3 - - env: INSTANCE=default-arch-base-latest-3002-2-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3002-2-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-2-py3 - # - env: INSTANCE=default-debian-10-3001-4-py3 - # - env: INSTANCE=default-debian-9-3001-4-py3 - # - env: INSTANCE=default-ubuntu-2004-3001-4-py3 - # - env: INSTANCE=default-ubuntu-1804-3001-4-py3 - # - env: INSTANCE=default-ubuntu-1604-3001-4-py3 - # - env: INSTANCE=default-centos-8-3001-4-py3 - # - env: INSTANCE=default-centos-7-3001-4-py3 - # - env: INSTANCE=default-fedora-33-3001-4-py3 - # - env: INSTANCE=default-fedora-32-3001-4-py3 - # - env: INSTANCE=default-opensuse-leap-152-3001-4-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3001-4-py3 - # - env: INSTANCE=default-amazonlinux-2-3001-4-py3 - # - env: INSTANCE=default-oraclelinux-8-3001-4-py3 - # - env: INSTANCE=default-oraclelinux-7-3001-4-py3 - # - env: INSTANCE=default-arch-base-latest-3001-4-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3001-4-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3001-4-py3 - # - env: INSTANCE=default-debian-10-3000-6-py3 - # - env: INSTANCE=default-debian-9-3000-6-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-6-py3 - # - env: INSTANCE=default-ubuntu-1604-3000-6-py3 - # - env: INSTANCE=default-centos-8-3000-6-py3 - # - env: INSTANCE=default-centos-7-3000-6-py3 - # - env: INSTANCE=default-opensuse-leap-152-3000-6-py3 - # - env: INSTANCE=default-amazonlinux-2-3000-6-py3 - # - env: INSTANCE=default-oraclelinux-8-3000-6-py3 - # - env: INSTANCE=default-oraclelinux-7-3000-6-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3000-6-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3000-6-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-6-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-6-py2 - # - env: INSTANCE=default-arch-base-latest-3000-6-py2 + # - env: INSTANCE=default-debian-10-3001-6-py3 + # - env: INSTANCE=default-debian-9-3001-6-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-6-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-6-py3 + # - env: INSTANCE=default-ubuntu-1604-3001-6-py3 + # - env: INSTANCE=default-centos-8-3001-6-py3 + # - env: INSTANCE=default-centos-7-3001-6-py3 + # - env: INSTANCE=default-fedora-33-3001-6-py3 + # - env: INSTANCE=default-fedora-32-3001-6-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-6-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-6-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-6-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-6-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-6-py3 + # - env: INSTANCE=default-arch-base-latest-3001-6-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3 + # - env: INSTANCE=default-debian-10-3000-8-py3 + # - env: INSTANCE=default-debian-9-3000-8-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-8-py3 + # - env: INSTANCE=default-ubuntu-1604-3000-8-py3 + # - env: INSTANCE=default-centos-8-3000-8-py3 + # - env: INSTANCE=default-centos-7-3000-8-py3 + # - env: INSTANCE=default-opensuse-leap-152-3000-8-py3 + # - env: INSTANCE=default-amazonlinux-2-3000-8-py3 + # - env: INSTANCE=default-oraclelinux-8-3000-8-py3 + # - env: INSTANCE=default-oraclelinux-7-3000-8-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-8-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-8-py2 + # - env: INSTANCE=default-arch-base-latest-3000-8-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index c1c11b9..f736542 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -102,34 +102,56 @@ platforms: driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd + ## SALT `3002.5` + - name: debian-10-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:debian-10 + - name: debian-9-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:debian-9 + - name: ubuntu-2004-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:ubuntu-16.04 + - name: centos-8-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:centos-8 + - name: centos-7-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:centos-7 + - name: fedora-33-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:fedora-33 + - name: fedora-32-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:fedora-32 + - name: amazonlinux-2-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:amazonlinux-2 + - name: oraclelinux-8-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:oraclelinux-8 + - name: oraclelinux-7-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:oraclelinux-7 + - name: arch-base-latest-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3002-5-py3 + driver: + image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd + ## SALT `3002.2` - - name: debian-10-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:debian-10 - - name: debian-9-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:debian-9 - - name: ubuntu-2004-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:ubuntu-16.04 - - name: centos-8-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:centos-8 - - name: centos-7-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:centos-7 - - name: fedora-33-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:fedora-33 - - name: fedora-32-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:fedora-32 - name: opensuse-leap-152-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 @@ -146,144 +168,124 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:amazonlinux-2 - - name: oraclelinux-8-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:oraclelinux-8 - - name: oraclelinux-7-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:oraclelinux-7 - - name: arch-base-latest-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:arch-base-latest - run_command: /usr/lib/systemd/systemd - - name: gentoo-stage3-latest-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:gentoo-stage3-systemd - ## SALT `3001.4` - - name: debian-10-3001-4-py3 + ## SALT `3001.6` + - name: debian-10-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:debian-10 - - name: debian-9-3001-4-py3 + image: saltimages/salt-3001.6-py3:debian-10 + - name: debian-9-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:debian-9 - - name: ubuntu-2004-3001-4-py3 + image: saltimages/salt-3001.6-py3:debian-9 + - name: ubuntu-2004-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-4-py3 + image: saltimages/salt-3001.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-4-py3 + image: saltimages/salt-3001.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:ubuntu-16.04 - - name: centos-8-3001-4-py3 + image: saltimages/salt-3001.6-py3:ubuntu-16.04 + - name: centos-8-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:centos-8 - - name: centos-7-3001-4-py3 + image: saltimages/salt-3001.6-py3:centos-8 + - name: centos-7-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:centos-7 - - name: fedora-33-3001-4-py3 + image: saltimages/salt-3001.6-py3:centos-7 + - name: fedora-33-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:fedora-33 - - name: fedora-32-3001-4-py3 + image: saltimages/salt-3001.6-py3:fedora-33 + - name: fedora-32-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:fedora-32 - - name: opensuse-leap-152-3001-4-py3 + image: saltimages/salt-3001.6-py3:fedora-32 + - name: opensuse-leap-152-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:opensuse-leap-15.2 + image: saltimages/salt-3001.6-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3001-4-py3 + - name: opensuse-tmbl-latest-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3001-4-py3 + - name: amazonlinux-2-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:amazonlinux-2 - - name: oraclelinux-8-3001-4-py3 + image: saltimages/salt-3001.6-py3:amazonlinux-2 + - name: oraclelinux-8-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:oraclelinux-8 - - name: oraclelinux-7-3001-4-py3 + image: saltimages/salt-3001.6-py3:oraclelinux-8 + - name: oraclelinux-7-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:oraclelinux-7 - - name: arch-base-latest-3001-4-py3 + image: saltimages/salt-3001.6-py3:oraclelinux-7 + - name: arch-base-latest-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:arch-base-latest + image: saltimages/salt-3001.6-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - name: gentoo-stage3-latest-3001-4-py3 + - name: gentoo-stage3-latest-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:gentoo-stage3-latest + image: saltimages/salt-3001.6-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3001-4-py3 + - name: gentoo-stage3-systemd-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:gentoo-stage3-systemd + image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd - ## SALT `3000.6` - - name: debian-10-3000-6-py3 + ## SALT `3000.8` + - name: debian-10-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:debian-10 - - name: debian-9-3000-6-py3 + image: saltimages/salt-3000.8-py3:debian-10 + - name: debian-9-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:debian-9 - - name: ubuntu-1804-3000-6-py3 + image: saltimages/salt-3000.8-py3:debian-9 + - name: ubuntu-1804-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-6-py3 + image: saltimages/salt-3000.8-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:ubuntu-16.04 - - name: centos-8-3000-6-py3 + image: saltimages/salt-3000.8-py3:ubuntu-16.04 + - name: centos-8-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:centos-8 - - name: centos-7-3000-6-py3 + image: saltimages/salt-3000.8-py3:centos-8 + - name: centos-7-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:centos-7 - - name: opensuse-leap-152-3000-6-py3 + image: saltimages/salt-3000.8-py3:centos-7 + - name: opensuse-leap-152-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:opensuse-leap-15.2 + image: saltimages/salt-3000.8-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3000-6-py3 + - name: amazonlinux-2-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:amazonlinux-2 - - name: oraclelinux-8-3000-6-py3 + image: saltimages/salt-3000.8-py3:amazonlinux-2 + - name: oraclelinux-8-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:oraclelinux-8 - - name: oraclelinux-7-3000-6-py3 + image: saltimages/salt-3000.8-py3:oraclelinux-8 + - name: oraclelinux-7-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:oraclelinux-7 - - name: gentoo-stage3-latest-3000-6-py3 + image: saltimages/salt-3000.8-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:gentoo-stage3-latest + image: saltimages/salt-3000.8-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3000-6-py3 + - name: gentoo-stage3-systemd-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:gentoo-stage3-systemd - - name: ubuntu-1804-3000-6-py2 + image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd + - name: ubuntu-1804-3000-8-py2 driver: - image: saltimages/salt-3000.6-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-6-py2 + image: saltimages/salt-3000.8-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-8-py2 driver: - image: saltimages/salt-3000.6-py2:ubuntu-16.04 - - name: arch-base-latest-3000-6-py2 + image: saltimages/salt-3000.8-py2:ubuntu-16.04 + - name: arch-base-latest-3000-8-py2 driver: - image: saltimages/salt-3000.6-py2:arch-base-latest + image: saltimages/salt-3000.8-py2:arch-base-latest run_command: /usr/lib/systemd/systemd provisioner: From b396b24fe456de7001b2cc013814ada189351e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 23 Sep 2020 15:51:03 -0300 Subject: [PATCH 11/45] feat(config): validate config before applying --- nginx/config.sls | 3 +++ nginx/map.jinja | 1 + pillar.example | 11 +++++++++++ 3 files changed, 15 insertions(+) diff --git a/nginx/config.sls b/nginx/config.sls index 3cd00b5..82b181f 100644 --- a/nginx/config.sls +++ b/nginx/config.sls @@ -31,3 +31,6 @@ nginx_config: - context: config: {{ nginx.server.config|json(sort_keys=False) }} {% endif %} +{% if nginx.check_config_before_apply %} + - check_cmd: /usr/sbin/nginx -t -c +{% endif %} diff --git a/nginx/map.jinja b/nginx/map.jinja index c273349..d66b17c 100644 --- a/nginx/map.jinja +++ b/nginx/map.jinja @@ -112,6 +112,7 @@ 'install_from_ppa': False, 'install_from_repo': False, 'install_from_phusionpassenger': False, + 'check_config_before_apply': False, 'ppa_version': 'stable', 'source_version': '1.10.0', 'source_hash': '8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d', diff --git a/pillar.example b/pillar.example index 3654979..ce6109b 100644 --- a/pillar.example +++ b/pillar.example @@ -28,6 +28,17 @@ nginx: source_version: '1.10.0' source_hash: '' + # Check the configuration before applying: + # To prevent applying a configuration that might break nginx, set this + # parameter to true so the configuration is checked BEFORE applying. If + # the check fails, the state will fail and it won't be deployed. + # CAVEAT: As the configuration file is created in a temp dir, it can't + # have relative references or it will fail to check. You'll need to + # specify full paths where required (ie, `include`, `load_module`, + # `snippets`, etc.0 + # Defaults to false + check_config_before_apply: false + # These are usually set by grains in map.jinja # Typically you can comment these out. lookup: From 7271c9d16c8218244ae5ef0b188b7f9f4a414074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 23 Sep 2020 16:05:07 -0300 Subject: [PATCH 12/45] fix(passenger): various fixes * correctly set dependencies in configuration * update RPM repo key * add tests for passenger installation as nginx module * update test matrix --- .yamllint | 2 +- nginx/map.jinja | 2 +- nginx/passenger.sls | 2 + nginx/pkg.sls | 2 +- nginx/snippets.sls | 5 ++ test/integration/default/controls/config.rb | 20 +++--- test/integration/default/controls/install.rb | 2 + test/integration/default/controls/service.rb | 2 + test/integration/passenger/README.md | 50 ++++++++++++++ test/integration/passenger/controls/config.rb | 58 ++++++++++++++++ .../integration/passenger/controls/install.rb | 28 ++++++++ .../integration/passenger/controls/service.rb | 28 ++++++++ test/integration/passenger/inspec.yml | 12 ++++ test/salt/passenger/pillar/nginx.sls | 68 +++++++++++++++++++ 14 files changed, 270 insertions(+), 11 deletions(-) create mode 100644 test/integration/passenger/README.md create mode 100644 test/integration/passenger/controls/config.rb create mode 100644 test/integration/passenger/controls/install.rb create mode 100644 test/integration/passenger/controls/service.rb create mode 100644 test/integration/passenger/inspec.yml create mode 100644 test/salt/passenger/pillar/nginx.sls diff --git a/.yamllint b/.yamllint index 5a060ef..73d532d 100644 --- a/.yamllint +++ b/.yamllint @@ -14,7 +14,7 @@ ignore: | .cache/ .git/ node_modules/ - test/**/states/**/*.sls + test/salt/**/*.sls .kitchen/ yaml-files: diff --git a/nginx/map.jinja b/nginx/map.jinja index d66b17c..5b3e1bd 100644 --- a/nginx/map.jinja +++ b/nginx/map.jinja @@ -9,7 +9,7 @@ 'Debian': { 'package': 'nginx', 'passenger_package': 'passenger', - 'passenger_config_file': '/etc/nginx/conf.d/passenger.conf', + 'passenger_config_file': '/etc/nginx/conf.d/mod-http-passenger.conf', 'service': 'nginx', 'webuser': 'www-data', 'conf_file': '/etc/nginx/nginx.conf', diff --git a/nginx/passenger.sls b/nginx/passenger.sls index 91808c0..e9ef786 100644 --- a/nginx/passenger.sls +++ b/nginx/passenger.sls @@ -25,6 +25,7 @@ passenger_install: - pkg: nginx_install - require_in: - service: nginx_service + - file: nginx_config /etc/nginx/passenger.conf: file.absent: @@ -46,6 +47,7 @@ passenger_config: - service: nginx_service - require_in: - service: nginx_service + - file: nginx_config - require: - file: /etc/nginx/passenger.conf - pkg: passenger_install diff --git a/nginx/pkg.sls b/nginx/pkg.sls index 3fd8434..a136e18 100644 --- a/nginx/pkg.sls +++ b/nginx/pkg.sls @@ -163,7 +163,7 @@ nginx_phusionpassenger_yum_repo: - baseurl: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' - repo_gpgcheck: 1 - gpgcheck: 0 - - gpgkey: 'https://packagecloud.io/gpg.key' + - gpgkey: 'https://oss-binaries.phusionpassenger.com/yum/definitions/RPM-GPG-KEY.asc' - enabled: True - sslverify: 1 - sslcacert: /etc/pki/tls/certs/ca-bundle.crt diff --git a/nginx/snippets.sls b/nginx/snippets.sls index 31a0a15..d09ba36 100644 --- a/nginx/snippets.sls +++ b/nginx/snippets.sls @@ -28,4 +28,9 @@ nginx_snippet_{{ snippet }}: - context: config: {{ config|json() }} nginx: {{ _nginx|json() }} + - require: + - file: nginx_snippets_dir + - require_in: + - file: nginx_config + - service: nginx_service {% endfor %} diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index a01ef3b..8360854 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -1,7 +1,9 @@ +# frozen_string_literal: true + # Set defaults, use debian as base server_available = '/etc/nginx/sites-available' -server_enabled = '/etc/nginx/sites-enabled' +server_enabled = '/etc/nginx/sites-enabled' # Override by platform family case platform[:family] @@ -22,9 +24,13 @@ control 'Nginx configuration' do it { should be_owned_by 'root' } it { should be_grouped_into 'root' } its('mode') { should cmp '0644' } - its('content') { should include %Q[ log_format main '$remote_addr - $remote_user [$time_local] $status ' + its('content') do + # rubocop:disable Metrics/LineLength + should include %( log_format main '$remote_addr - $remote_user [$time_local] $status ' '"$request" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"';] } + '"$http_user_agent" "$http_x_forwarded_for"';) + # rubocop:enable Metrics/LineLength + end end # snippets configuration @@ -40,12 +46,11 @@ control 'Nginx configuration' do # sites configuration [server_available, server_enabled].each do |dir| - - describe file ("#{dir}/default") do - it { should_not exist } + describe file "#{dir}/default" do + it { should_not exist } end - describe file ("#{dir}/mysite") do + describe file "#{dir}/mysite" do it { should be_file } it { should be_owned_by 'root' } it { should be_grouped_into 'root' } @@ -57,6 +62,5 @@ control 'Nginx configuration' do its('content') { should include 'try_files $uri $uri/ =404;' } its('content') { should include 'include snippets/letsencrypt.conf;' } end - end end diff --git a/test/integration/default/controls/install.rb b/test/integration/default/controls/install.rb index 49aea2e..5aa8d0e 100644 --- a/test/integration/default/controls/install.rb +++ b/test/integration/default/controls/install.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'Nginx package' do title 'should be installed' diff --git a/test/integration/default/controls/service.rb b/test/integration/default/controls/service.rb index c979d24..605e936 100644 --- a/test/integration/default/controls/service.rb +++ b/test/integration/default/controls/service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'Nginx service' do title 'should be running and enabled' diff --git a/test/integration/passenger/README.md b/test/integration/passenger/README.md new file mode 100644 index 0000000..66fa3cd --- /dev/null +++ b/test/integration/passenger/README.md @@ -0,0 +1,50 @@ +# InSpec Profile: `passenger` + +This shows the implementation of the `passenger` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). + +## Verify a profile + +InSpec ships with built-in features to verify a profile structure. + +```bash +$ inspec check passenger +Summary +------- +Location: passenger +Profile: profile +Controls: 4 +Timestamp: 2019-06-24T23:09:01+00:00 +Valid: true + +Errors +------ + +Warnings +-------- +``` + +## Execute a profile + +To run all **supported** controls on a local machine use `inspec exec /path/to/profile`. + +```bash +$ inspec exec passenger +.. + +Finished in 0.0025 seconds (files took 0.12449 seconds to load) +8 examples, 0 failures +``` + +## Execute a specific control from a profile + +To run one control from the profile use `inspec exec /path/to/profile --controls name`. + +```bash +$ inspec exec passenger --controls package +. + +Finished in 0.0025 seconds (files took 0.12449 seconds to load) +1 examples, 0 failures +``` + +See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb). diff --git a/test/integration/passenger/controls/config.rb b/test/integration/passenger/controls/config.rb new file mode 100644 index 0000000..177a8dc --- /dev/null +++ b/test/integration/passenger/controls/config.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +# Set defaults, use debian as base + +# Override by OS Family +case platform[:family] +when 'redhat', 'centos', 'fedora' + server_available = '/etc/nginx/conf.d' + server_enabled = '/etc/nginx/conf.d' + passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' + passenger_root = '/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini' + passenger_config_file = '/etc/nginx/conf.d/passenger.conf' + should_not_exist_file = '/etc/nginx/conf.d/mod-http-passenger.conf' +when 'debian', 'ubuntu' + server_available = '/etc/nginx/sites-available' + server_enabled = '/etc/nginx/sites-enabled' + passenger_mod = '/usr/lib/nginx/modules/ngx_http_passenger_module.so' + passenger_root = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini' + passenger_config_file = '/etc/nginx/conf.d/mod-http-passenger.conf' + should_not_exist_file = '/etc/nginx/conf.d/passenger.conf' +end + +control 'Passenger configuration' do + title 'should match desired lines' + + # main configuration + describe file('/etc/nginx/nginx.conf') do + its('content') { should include "load_module #{passenger_mod}" } + end + + describe file(passenger_config_file) do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + its('content') { should include "passenger_root #{passenger_root};" } + its('content') { should include 'passenger_ruby /usr/bin/ruby;' } + end + + describe file(should_not_exist_file) do + it { should_not exist } + end + + # sites configuration + [server_available, server_enabled].each do |dir| + describe file "#{dir}/default" do + it { should_not exist } + end + + describe file "#{dir}/mysite" do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + its('content') { should include 'passenger_enabled on;' } + end + end +end diff --git a/test/integration/passenger/controls/install.rb b/test/integration/passenger/controls/install.rb new file mode 100644 index 0000000..bbba8cb --- /dev/null +++ b/test/integration/passenger/controls/install.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +control 'Nginx package' do + title 'should be installed' + + describe package('nginx') do + it { should be_installed } + end +end + +control 'Passenger packages' do + title 'should be installed' + + # Override by OS Family + passenger_mod_pkg = case platform[:family] + when 'redhat', 'centos', 'fedora' + 'nginx-mod-http-passenger' + when 'debian', 'ubuntu' + 'libnginx-mod-http-passenger' + end + + describe package('passenger') do + it { should be_installed } + end + describe package(passenger_mod_pkg) do + it { should be_installed } + end +end diff --git a/test/integration/passenger/controls/service.rb b/test/integration/passenger/controls/service.rb new file mode 100644 index 0000000..b4af800 --- /dev/null +++ b/test/integration/passenger/controls/service.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +control 'Nginx service' do + title 'should be running and enabled' + + describe service('nginx') do + it { should be_enabled } + it { should be_running } + end +end + +control 'Passenger module' do + title 'should be running and enabled' + + describe 'Passenger engine' do + it 'passenger-config should say configuration "looks good"' do + expect(command( + '/usr/bin/passenger-config validate-install --auto' + ).stdout).to match(/looks good/) + end + + it 'passenger-memory-stats should return Passenger stats' do + expect(command('/usr/sbin/passenger-memory-stats').stdout).to match( + %r{nginx: master process /usr/sbin/nginx.*Passenger watchdog.*Passenger core.*}m + ) + end + end +end diff --git a/test/integration/passenger/inspec.yml b/test/integration/passenger/inspec.yml new file mode 100644 index 0000000..08c695d --- /dev/null +++ b/test/integration/passenger/inspec.yml @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: default +title: nginx formula +maintainer: SaltStack Formulas +license: Apache-2.0 +summary: Verify that the nginx formula is setup and configured correctly +supports: + - platform-name: debian + - platform-name: ubuntu + - platform-name: centos diff --git a/test/salt/passenger/pillar/nginx.sls b/test/salt/passenger/pillar/nginx.sls new file mode 100644 index 0000000..95edc52 --- /dev/null +++ b/test/salt/passenger/pillar/nginx.sls @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +# Simple pillar setup +# - snippet letsencrypt +# - remove 'default' site +# - create 'mysite' site + +{%- if grains.os_family in ('RedHat',) %} + {%- set passenger_pkg = 'nginx-mod-http-passenger' %} + {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' %} +{%- else %} + {%- set passenger_pkg = 'libnginx-mod-http-passenger' %} + {%- set passenger_mod = '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %} +{%- endif %} + +nginx: + check_config_before_apply: true + + install_from_phusionpassenger: true + lookup: + passenger_package: {{ passenger_pkg }} + + snippets: + letsencrypt.conf: + - location ^~ /.well-known/acme-challenge/: + - proxy_pass: http://localhost:9999 + server: + + config: + # This is required to get the passenger module loaded + # In Debian it can be done with this + # include: 'modules-enabled/*.conf' + load_module: {{ passenger_mod }} + + worker_processes: 4 + http: + ### module ngx_http_log_module example + log_format: |- + main '$remote_addr - $remote_user [$time_local] $status ' + '"$request" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"' + include: + - /etc/nginx/mime.types + - /etc/nginx/conf.d/*.conf + - /etc/nginx/sites-enabled/* + + servers: + managed: + default: + deleted: true + enabled: false + config: {} + + mysite: + enabled: true + config: + - server: + - passenger_enabled: 'on' + + - server_name: localhost + - listen: + - '80 default_server' + - index: 'index.html index.htm' + - location ~ .htm: + - try_files: '$uri $uri/ =404' + # - include: '/etc/nginx/snippets/letsencrypt.conf' + - include: 'snippets/letsencrypt.conf' From eedfc56b41b673e196029274048670e89e55a694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Thu, 11 Mar 2021 13:41:37 -0300 Subject: [PATCH 13/45] ci(kitchen+ci): make rubocop happy [skip ci] --- test/integration/default/controls/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 8360854..1a405ff 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -7,7 +7,7 @@ server_enabled = '/etc/nginx/sites-enabled' # Override by platform family case platform[:family] -when 'redhat','fedora' +when 'redhat', 'fedora' server_available = '/etc/nginx/conf.d' server_enabled = '/etc/nginx/conf.d' when 'suse' From 1d9a15fe49c5456a7552dd797c49afabcabfa294 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 11 Mar 2021 17:20:41 +0000 Subject: [PATCH 14/45] chore(release): 2.6.0 [skip ci] # [2.6.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.5.0...v2.6.0) (2021-03-11) ### Bug Fixes * **passenger:** various fixes ([7271c9d](https://github.com/saltstack-formulas/nginx-formula/commit/7271c9d16c8218244ae5ef0b188b7f9f4a414074)) * **pkg:** add inline EPEL repo configuration for Amazon Linux 2 ([ae6375c](https://github.com/saltstack-formulas/nginx-formula/commit/ae6375ccccd56a506ee28babbeabf351112a06de)) ### Continuous Integration * **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([123d13e](https://github.com/saltstack-formulas/nginx-formula/commit/123d13e2f483c203cbfc1366b36a30e1732603e1)) * **kitchen+ci:** make rubocop happy [skip ci] ([eedfc56](https://github.com/saltstack-formulas/nginx-formula/commit/eedfc56b41b673e196029274048670e89e55a694)) * **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([63d32a4](https://github.com/saltstack-formulas/nginx-formula/commit/63d32a40b13ca2c77bb83cceba620218617aab6a)) * **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([b4411c6](https://github.com/saltstack-formulas/nginx-formula/commit/b4411c61d3352ecb9775197f991f5f33996730dc)) * **pre-commit:** update hook for `rubocop` [skip ci] ([2a23743](https://github.com/saltstack-formulas/nginx-formula/commit/2a23743fca8fd54b2a18dc2a07d0daa8142c0289)) ### Features * **config:** validate config before applying ([b396b24](https://github.com/saltstack-formulas/nginx-formula/commit/b396b24fe456de7001b2cc013814ada189351e6f)) ### Tests * **config:** fix for Amazon Linux 2 & Oracle Linux 7/8 ([ab39c8f](https://github.com/saltstack-formulas/nginx-formula/commit/ab39c8f7c3c9bf5dbd4436cad8ccce21263fe646)) --- AUTHORS.md | 147 ++++++++++++++++++++--------------------- CHANGELOG.md | 27 ++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 159 +++++++++++++++++++++++---------------------- docs/CHANGELOG.rst | 32 +++++++++ 5 files changed, 215 insertions(+), 152 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 87a22dc..c7321bf 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,79 +4,80 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|82 -@aboe76|[@aboe76](https://github.com/aboe76)|46 -@gravyboat|[@gravyboat](https://github.com/gravyboat)|27 -@nmadhok|[@nmadhok](https://github.com/nmadhok)|24 -@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 -@whiteinge|[@whiteinge](https://github.com/whiteinge)|17 -@ross-p|[@ross-p](https://github.com/ross-p)|13 -@daks|[@daks](https://github.com/daks)|11 -@techhat|[@techhat](https://github.com/techhat)|10 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|9 -@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|8 -@cheuschober|[@cheuschober](https://github.com/cheuschober)|8 -@dseira|[@dseira](https://github.com/dseira)|8 -@amontalban|[@amontalban](https://github.com/amontalban)|7 -@puneetk|[@puneetk](https://github.com/puneetk)|7 -@TaiSHiNet|[@TaiSHiNet](https://github.com/TaiSHiNet)|6 -@EvaSDK|[@EvaSDK](https://github.com/EvaSDK)|6 -@cackovic|[@cackovic](https://github.com/cackovic)|5 -@auser|[@auser](https://github.com/auser)|5 -@stp-ip|[@stp-ip](https://github.com/stp-ip)|5 -@ahmadsherif|[@ahmadsherif](https://github.com/ahmadsherif)|4 -@n-rodriguez|[@n-rodriguez](https://github.com/n-rodriguez)|4 -@teepark|[@teepark](https://github.com/teepark)|4 -@alinefr|[@alinefr](https://github.com/alinefr)|3 -@devaos|[@devaos](https://github.com/devaos)|3 -@bmwiedemann|[@bmwiedemann](https://github.com/bmwiedemann)|3 -@terminalmage|[@terminalmage](https://github.com/terminalmage)|3 -@imran1008|[@imran1008](https://github.com/imran1008)|3 -@morsik|[@morsik](https://github.com/morsik)|3 -@msciciel|[@msciciel](https://github.com/msciciel)|3 -@rfairburn|[@rfairburn](https://github.com/rfairburn)|3 -@westurner|[@westurner](https://github.com/westurner)|3 -@chris-sanders|[@chris-sanders](https://github.com/chris-sanders)|2 -@dafyddj|[@dafyddj](https://github.com/dafyddj)|2 -@UtahDave|[@UtahDave](https://github.com/UtahDave)|2 -@ghtyrant|[@ghtyrant](https://github.com/ghtyrant)|2 -@pprkut|[@pprkut](https://github.com/pprkut)|2 -@jstrunk|[@jstrunk](https://github.com/jstrunk)|2 -@johnkeates|[@johnkeates](https://github.com/johnkeates)|2 -@kmshultz|[@kmshultz](https://github.com/kmshultz)|2 -@malept|[@malept](https://github.com/malept)|2 -@meganlkm|[@meganlkm](https://github.com/meganlkm)|2 -@garrettw|[@garrettw](https://github.com/garrettw)|2 -@ErisDS|[@ErisDS](https://github.com/ErisDS)|2 -@myoung34|[@myoung34](https://github.com/myoung34)|2 -@sticky-note|[@sticky-note](https://github.com/sticky-note)|2 -@bebosudo|[@bebosudo](https://github.com/bebosudo)|1 -@aanriot|[@aanriot](https://github.com/aanriot)|1 -@andrew-vant|[@andrew-vant](https://github.com/andrew-vant)|1 -@bemosior|[@bemosior](https://github.com/bemosior)|1 -@SuperTux88|[@SuperTux88](https://github.com/SuperTux88)|1 -@bogdanr|[@bogdanr](https://github.com/bogdanr)|1 -@blbradley|[@blbradley](https://github.com/blbradley)|1 -@CorwinTanner|[@CorwinTanner](https://github.com/CorwinTanner)|1 -@fayetted|[@fayetted](https://github.com/fayetted)|1 -@czarneckid|[@czarneckid](https://github.com/czarneckid)|1 -@statik|[@statik](https://github.com/statik)|1 -@ekristen|[@ekristen](https://github.com/ekristen)|1 -@jeduardo|[@jeduardo](https://github.com/jeduardo)|1 -@stromnet|[@stromnet](https://github.com/stromnet)|1 -@bsdlp|[@bsdlp](https://github.com/bsdlp)|1 -@MEschenbacher|[@MEschenbacher](https://github.com/MEschenbacher)|1 -@renich|[@renich](https://github.com/renich)|1 -@outime|[@outime](https://github.com/outime)|1 -@scub|[@scub](https://github.com/scub)|1 -@thatch45|[@thatch45](https://github.com/thatch45)|1 -@blarghmatey|[@blarghmatey](https://github.com/blarghmatey)|1 -@babilen5|[@babilen5](https://github.com/babilen5)|1 -@abednarik|[@abednarik](https://github.com/abednarik)|1 -@francesco-a|[@francesco-a](https://github.com/francesco-a)|1 -@oboyle|[@oboyle](https://github.com/oboyle)|1 -@bersace|[@bersace](https://github.com/bersace)|1 +@myii|[@myii](https://github.com/myii)|90 +@aboe76|[@aboe76](https://github.com/aboe76)|46 +@gravyboat|[@gravyboat](https://github.com/gravyboat)|27 +@nmadhok|[@nmadhok](https://github.com/nmadhok)|24 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 +@whiteinge|[@whiteinge](https://github.com/whiteinge)|17 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|13 +@ross-p|[@ross-p](https://github.com/ross-p)|13 +@daks|[@daks](https://github.com/daks)|11 +@techhat|[@techhat](https://github.com/techhat)|10 +@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|8 +@cheuschober|[@cheuschober](https://github.com/cheuschober)|8 +@dseira|[@dseira](https://github.com/dseira)|8 +@amontalban|[@amontalban](https://github.com/amontalban)|7 +@puneetk|[@puneetk](https://github.com/puneetk)|7 +@TaiSHiNet|[@TaiSHiNet](https://github.com/TaiSHiNet)|6 +@EvaSDK|[@EvaSDK](https://github.com/EvaSDK)|6 +@cackovic|[@cackovic](https://github.com/cackovic)|5 +@auser|[@auser](https://github.com/auser)|5 +@stp-ip|[@stp-ip](https://github.com/stp-ip)|5 +@ahmadsherif|[@ahmadsherif](https://github.com/ahmadsherif)|4 +@n-rodriguez|[@n-rodriguez](https://github.com/n-rodriguez)|4 +@teepark|[@teepark](https://github.com/teepark)|4 +@alinefr|[@alinefr](https://github.com/alinefr)|3 +@devaos|[@devaos](https://github.com/devaos)|3 +@bmwiedemann|[@bmwiedemann](https://github.com/bmwiedemann)|3 +@dafyddj|[@dafyddj](https://github.com/dafyddj)|3 +@terminalmage|[@terminalmage](https://github.com/terminalmage)|3 +@imran1008|[@imran1008](https://github.com/imran1008)|3 +@morsik|[@morsik](https://github.com/morsik)|3 +@msciciel|[@msciciel](https://github.com/msciciel)|3 +@rfairburn|[@rfairburn](https://github.com/rfairburn)|3 +@westurner|[@westurner](https://github.com/westurner)|3 +@chris-sanders|[@chris-sanders](https://github.com/chris-sanders)|2 +@UtahDave|[@UtahDave](https://github.com/UtahDave)|2 +@ghtyrant|[@ghtyrant](https://github.com/ghtyrant)|2 +@pprkut|[@pprkut](https://github.com/pprkut)|2 +@jstrunk|[@jstrunk](https://github.com/jstrunk)|2 +@johnkeates|[@johnkeates](https://github.com/johnkeates)|2 +@kmshultz|[@kmshultz](https://github.com/kmshultz)|2 +@malept|[@malept](https://github.com/malept)|2 +@meganlkm|[@meganlkm](https://github.com/meganlkm)|2 +@garrettw|[@garrettw](https://github.com/garrettw)|2 +@ErisDS|[@ErisDS](https://github.com/ErisDS)|2 +@myoung34|[@myoung34](https://github.com/myoung34)|2 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|2 +@bebosudo|[@bebosudo](https://github.com/bebosudo)|1 +@aanriot|[@aanriot](https://github.com/aanriot)|1 +@andrew-vant|[@andrew-vant](https://github.com/andrew-vant)|1 +@bemosior|[@bemosior](https://github.com/bemosior)|1 +@SuperTux88|[@SuperTux88](https://github.com/SuperTux88)|1 +@bogdanr|[@bogdanr](https://github.com/bogdanr)|1 +@blbradley|[@blbradley](https://github.com/blbradley)|1 +@CorwinTanner|[@CorwinTanner](https://github.com/CorwinTanner)|1 +@fayetted|[@fayetted](https://github.com/fayetted)|1 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 +@czarneckid|[@czarneckid](https://github.com/czarneckid)|1 +@statik|[@statik](https://github.com/statik)|1 +@ekristen|[@ekristen](https://github.com/ekristen)|1 +@jeduardo|[@jeduardo](https://github.com/jeduardo)|1 +@stromnet|[@stromnet](https://github.com/stromnet)|1 +@bsdlp|[@bsdlp](https://github.com/bsdlp)|1 +@MEschenbacher|[@MEschenbacher](https://github.com/MEschenbacher)|1 +@renich|[@renich](https://github.com/renich)|1 +@outime|[@outime](https://github.com/outime)|1 +@scub|[@scub](https://github.com/scub)|1 +@thatch45|[@thatch45](https://github.com/thatch45)|1 +@blarghmatey|[@blarghmatey](https://github.com/blarghmatey)|1 +@babilen5|[@babilen5](https://github.com/babilen5)|1 +@abednarik|[@abednarik](https://github.com/abednarik)|1 +@francesco-a|[@francesco-a](https://github.com/francesco-a)|1 +@oboyle|[@oboyle](https://github.com/oboyle)|1 +@bersace|[@bersace](https://github.com/bersace)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-01-04. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-11. diff --git a/CHANGELOG.md b/CHANGELOG.md index c1a27ac..477a4c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +# [2.6.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.5.0...v2.6.0) (2021-03-11) + + +### Bug Fixes + +* **passenger:** various fixes ([7271c9d](https://github.com/saltstack-formulas/nginx-formula/commit/7271c9d16c8218244ae5ef0b188b7f9f4a414074)) +* **pkg:** add inline EPEL repo configuration for Amazon Linux 2 ([ae6375c](https://github.com/saltstack-formulas/nginx-formula/commit/ae6375ccccd56a506ee28babbeabf351112a06de)) + + +### Continuous Integration + +* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([123d13e](https://github.com/saltstack-formulas/nginx-formula/commit/123d13e2f483c203cbfc1366b36a30e1732603e1)) +* **kitchen+ci:** make rubocop happy [skip ci] ([eedfc56](https://github.com/saltstack-formulas/nginx-formula/commit/eedfc56b41b673e196029274048670e89e55a694)) +* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([63d32a4](https://github.com/saltstack-formulas/nginx-formula/commit/63d32a40b13ca2c77bb83cceba620218617aab6a)) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([b4411c6](https://github.com/saltstack-formulas/nginx-formula/commit/b4411c61d3352ecb9775197f991f5f33996730dc)) +* **pre-commit:** update hook for `rubocop` [skip ci] ([2a23743](https://github.com/saltstack-formulas/nginx-formula/commit/2a23743fca8fd54b2a18dc2a07d0daa8142c0289)) + + +### Features + +* **config:** validate config before applying ([b396b24](https://github.com/saltstack-formulas/nginx-formula/commit/b396b24fe456de7001b2cc013814ada189351e6f)) + + +### Tests + +* **config:** fix for Amazon Linux 2 & Oracle Linux 7/8 ([ab39c8f](https://github.com/saltstack-formulas/nginx-formula/commit/ab39c8f7c3c9bf5dbd4436cad8ccce21263fe646)) + # [2.5.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.4.1...v2.5.0) (2021-01-04) diff --git a/FORMULA b/FORMULA index 0dc428b..bbee674 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.5.0 +version: 2.6.0 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 57a4015..50d6656 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -13,224 +13,227 @@ This list is sorted by the number of commits per contributor in *descending* ord * - Avatar - Contributor - Contributions - * - :raw-html-m2r:`@myii` + * - :raw-html-m2r:`@myii` - `@myii `_ - - 82 - * - :raw-html-m2r:`@aboe76` + - 90 + * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 - * - :raw-html-m2r:`@gravyboat` + * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 27 - * - :raw-html-m2r:`@nmadhok` + * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 24 - * - :raw-html-m2r:`@noelmcloughlin` + * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 - * - :raw-html-m2r:`@whiteinge` + * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 17 - * - :raw-html-m2r:`@ross-p` + * - :raw-html-m2r:`@javierbertoli` + - `@javierbertoli `_ + - 13 + * - :raw-html-m2r:`@ross-p` - `@ross-p `_ - 13 - * - :raw-html-m2r:`@daks` + * - :raw-html-m2r:`@daks` - `@daks `_ - 11 - * - :raw-html-m2r:`@techhat` + * - :raw-html-m2r:`@techhat` - `@techhat `_ - 10 - * - :raw-html-m2r:`@javierbertoli` - - `@javierbertoli `_ - - 9 - * - :raw-html-m2r:`@arthurlogilab` + * - :raw-html-m2r:`@arthurlogilab` - `@arthurlogilab `_ - 8 - * - :raw-html-m2r:`@cheuschober` + * - :raw-html-m2r:`@cheuschober` - `@cheuschober `_ - 8 - * - :raw-html-m2r:`@dseira` + * - :raw-html-m2r:`@dseira` - `@dseira `_ - 8 - * - :raw-html-m2r:`@amontalban` + * - :raw-html-m2r:`@amontalban` - `@amontalban `_ - 7 - * - :raw-html-m2r:`@puneetk` + * - :raw-html-m2r:`@puneetk` - `@puneetk `_ - 7 - * - :raw-html-m2r:`@TaiSHiNet` + * - :raw-html-m2r:`@TaiSHiNet` - `@TaiSHiNet `_ - 6 - * - :raw-html-m2r:`@EvaSDK` + * - :raw-html-m2r:`@EvaSDK` - `@EvaSDK `_ - 6 - * - :raw-html-m2r:`@cackovic` + * - :raw-html-m2r:`@cackovic` - `@cackovic `_ - 5 - * - :raw-html-m2r:`@auser` + * - :raw-html-m2r:`@auser` - `@auser `_ - 5 - * - :raw-html-m2r:`@stp-ip` + * - :raw-html-m2r:`@stp-ip` - `@stp-ip `_ - 5 - * - :raw-html-m2r:`@ahmadsherif` + * - :raw-html-m2r:`@ahmadsherif` - `@ahmadsherif `_ - 4 - * - :raw-html-m2r:`@n-rodriguez` + * - :raw-html-m2r:`@n-rodriguez` - `@n-rodriguez `_ - 4 - * - :raw-html-m2r:`@teepark` + * - :raw-html-m2r:`@teepark` - `@teepark `_ - 4 - * - :raw-html-m2r:`@alinefr` + * - :raw-html-m2r:`@alinefr` - `@alinefr `_ - 3 - * - :raw-html-m2r:`@devaos` + * - :raw-html-m2r:`@devaos` - `@devaos `_ - 3 - * - :raw-html-m2r:`@bmwiedemann` + * - :raw-html-m2r:`@bmwiedemann` - `@bmwiedemann `_ - 3 - * - :raw-html-m2r:`@terminalmage` + * - :raw-html-m2r:`@dafyddj` + - `@dafyddj `_ + - 3 + * - :raw-html-m2r:`@terminalmage` - `@terminalmage `_ - 3 - * - :raw-html-m2r:`@imran1008` + * - :raw-html-m2r:`@imran1008` - `@imran1008 `_ - 3 - * - :raw-html-m2r:`@morsik` + * - :raw-html-m2r:`@morsik` - `@morsik `_ - 3 - * - :raw-html-m2r:`@msciciel` + * - :raw-html-m2r:`@msciciel` - `@msciciel `_ - 3 - * - :raw-html-m2r:`@rfairburn` + * - :raw-html-m2r:`@rfairburn` - `@rfairburn `_ - 3 - * - :raw-html-m2r:`@westurner` + * - :raw-html-m2r:`@westurner` - `@westurner `_ - 3 - * - :raw-html-m2r:`@chris-sanders` + * - :raw-html-m2r:`@chris-sanders` - `@chris-sanders `_ - 2 - * - :raw-html-m2r:`@dafyddj` - - `@dafyddj `_ - - 2 - * - :raw-html-m2r:`@UtahDave` + * - :raw-html-m2r:`@UtahDave` - `@UtahDave `_ - 2 - * - :raw-html-m2r:`@ghtyrant` + * - :raw-html-m2r:`@ghtyrant` - `@ghtyrant `_ - 2 - * - :raw-html-m2r:`@pprkut` + * - :raw-html-m2r:`@pprkut` - `@pprkut `_ - 2 - * - :raw-html-m2r:`@jstrunk` + * - :raw-html-m2r:`@jstrunk` - `@jstrunk `_ - 2 - * - :raw-html-m2r:`@johnkeates` + * - :raw-html-m2r:`@johnkeates` - `@johnkeates `_ - 2 - * - :raw-html-m2r:`@kmshultz` + * - :raw-html-m2r:`@kmshultz` - `@kmshultz `_ - 2 - * - :raw-html-m2r:`@malept` + * - :raw-html-m2r:`@malept` - `@malept `_ - 2 - * - :raw-html-m2r:`@meganlkm` + * - :raw-html-m2r:`@meganlkm` - `@meganlkm `_ - 2 - * - :raw-html-m2r:`@garrettw` + * - :raw-html-m2r:`@garrettw` - `@garrettw `_ - 2 - * - :raw-html-m2r:`@ErisDS` + * - :raw-html-m2r:`@ErisDS` - `@ErisDS `_ - 2 - * - :raw-html-m2r:`@myoung34` + * - :raw-html-m2r:`@myoung34` - `@myoung34 `_ - 2 - * - :raw-html-m2r:`@sticky-note` + * - :raw-html-m2r:`@sticky-note` - `@sticky-note `_ - 2 - * - :raw-html-m2r:`@bebosudo` + * - :raw-html-m2r:`@bebosudo` - `@bebosudo `_ - 1 - * - :raw-html-m2r:`@aanriot` + * - :raw-html-m2r:`@aanriot` - `@aanriot `_ - 1 - * - :raw-html-m2r:`@andrew-vant` + * - :raw-html-m2r:`@andrew-vant` - `@andrew-vant `_ - 1 - * - :raw-html-m2r:`@bemosior` + * - :raw-html-m2r:`@bemosior` - `@bemosior `_ - 1 - * - :raw-html-m2r:`@SuperTux88` + * - :raw-html-m2r:`@SuperTux88` - `@SuperTux88 `_ - 1 - * - :raw-html-m2r:`@bogdanr` + * - :raw-html-m2r:`@bogdanr` - `@bogdanr `_ - 1 - * - :raw-html-m2r:`@blbradley` + * - :raw-html-m2r:`@blbradley` - `@blbradley `_ - 1 - * - :raw-html-m2r:`@CorwinTanner` + * - :raw-html-m2r:`@CorwinTanner` - `@CorwinTanner `_ - 1 - * - :raw-html-m2r:`@fayetted` + * - :raw-html-m2r:`@fayetted` - `@fayetted `_ - 1 - * - :raw-html-m2r:`@czarneckid` + * - :raw-html-m2r:`@baby-gnu` + - `@baby-gnu `_ + - 1 + * - :raw-html-m2r:`@czarneckid` - `@czarneckid `_ - 1 - * - :raw-html-m2r:`@statik` + * - :raw-html-m2r:`@statik` - `@statik `_ - 1 - * - :raw-html-m2r:`@ekristen` + * - :raw-html-m2r:`@ekristen` - `@ekristen `_ - 1 - * - :raw-html-m2r:`@jeduardo` + * - :raw-html-m2r:`@jeduardo` - `@jeduardo `_ - 1 - * - :raw-html-m2r:`@stromnet` + * - :raw-html-m2r:`@stromnet` - `@stromnet `_ - 1 - * - :raw-html-m2r:`@bsdlp` + * - :raw-html-m2r:`@bsdlp` - `@bsdlp `_ - 1 - * - :raw-html-m2r:`@MEschenbacher` + * - :raw-html-m2r:`@MEschenbacher` - `@MEschenbacher `_ - 1 - * - :raw-html-m2r:`@renich` + * - :raw-html-m2r:`@renich` - `@renich `_ - 1 - * - :raw-html-m2r:`@outime` + * - :raw-html-m2r:`@outime` - `@outime `_ - 1 - * - :raw-html-m2r:`@scub` + * - :raw-html-m2r:`@scub` - `@scub `_ - 1 - * - :raw-html-m2r:`@thatch45` + * - :raw-html-m2r:`@thatch45` - `@thatch45 `_ - 1 - * - :raw-html-m2r:`@blarghmatey` + * - :raw-html-m2r:`@blarghmatey` - `@blarghmatey `_ - 1 - * - :raw-html-m2r:`@babilen5` + * - :raw-html-m2r:`@babilen5` - `@babilen5 `_ - 1 - * - :raw-html-m2r:`@abednarik` + * - :raw-html-m2r:`@abednarik` - `@abednarik `_ - 1 - * - :raw-html-m2r:`@francesco-a` + * - :raw-html-m2r:`@francesco-a` - `@francesco-a `_ - 1 - * - :raw-html-m2r:`@oboyle` + * - :raw-html-m2r:`@oboyle` - `@oboyle `_ - 1 - * - :raw-html-m2r:`@bersace` + * - :raw-html-m2r:`@bersace` - `@bersace `_ - 1 ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-01-04. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-11. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index a0e38f1..6a5a3e8 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,38 @@ Changelog ========= +`2.6.0 `_ (2021-03-11) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **passenger:** various fixes (\ `7271c9d `_\ ) +* **pkg:** add inline EPEL repo configuration for Amazon Linux 2 (\ `ae6375c `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `123d13e `_\ ) +* **kitchen+ci:** make rubocop happy [skip ci] (\ `eedfc56 `_\ ) +* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `63d32a4 `_\ ) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `b4411c6 `_\ ) +* **pre-commit:** update hook for ``rubocop`` [skip ci] (\ `2a23743 `_\ ) + +Features +^^^^^^^^ + + +* **config:** validate config before applying (\ `b396b24 `_\ ) + +Tests +^^^^^ + + +* **config:** fix for Amazon Linux 2 & Oracle Linux 7/8 (\ `ab39c8f `_\ ) + `2.5.0 `_ (2021-01-04) ------------------------------------------------------------------------------------------------------- From 0bbe68619fdf3791e6202ce3f17ca03efc4441c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Tue, 23 Mar 2021 11:24:29 +0000 Subject: [PATCH 15/45] ci(kitchen+ci): include `passenger` suite [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/303 --- .gitlab-ci.yml | 38 ++++++++++++++++++++++----- .travis.yml | 38 ++++++++++++++++++++++----- .yamllint | 3 ++- kitchen.yml | 24 +++++++++++++++++ test/integration/passenger/inspec.yml | 11 +++++++- 5 files changed, 98 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e18d4bf..67978ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,22 +133,45 @@ rubocop: # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} -default-debian-10-master-py3: {extends: '.test_instance'} -default-debian-9-master-py3: {extends: '.test_instance'} -default-ubuntu-2004-master-py3: {extends: '.test_instance'} -default-ubuntu-1804-master-py3: {extends: '.test_instance'} +# default-debian-10-master-py3: {extends: '.test_instance'} +# passenger-debian-10-master-py3: {extends: '.test_instance'} +debian-10-master-py3: {extends: '.test_instance'} +# default-debian-9-master-py3: {extends: '.test_instance'} +# passenger-debian-9-master-py3: {extends: '.test_instance'} +debian-9-master-py3: {extends: '.test_instance'} +# default-ubuntu-2004-master-py3: {extends: '.test_instance'} +# passenger-ubuntu-2004-master-py3: {extends: '.test_instance'} +ubuntu-2004-master-py3: {extends: '.test_instance'} +# default-ubuntu-1804-master-py3: {extends: '.test_instance'} +# passenger-ubuntu-1804-master-py3: {extends: '.test_instance'} +ubuntu-1804-master-py3: {extends: '.test_instance'} default-ubuntu-1604-master-py3: {extends: '.test_instance'} -default-centos-8-master-py3: {extends: '.test_instance'} -default-centos-7-master-py3: {extends: '.test_instance'} +# ubuntu-1604-master-py3: {extends: '.test_instance'} +# default-centos-8-master-py3: {extends: '.test_instance'} +# passenger-centos-8-master-py3: {extends: '.test_instance'} +centos-8-master-py3: {extends: '.test_instance'} +# default-centos-7-master-py3: {extends: '.test_instance'} +# passenger-centos-7-master-py3: {extends: '.test_instance'} +centos-7-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} +# fedora-33-master-py3: {extends: '.test_instance'} default-fedora-32-master-py3: {extends: '.test_instance'} +# fedora-32-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'} +# opensuse-leap-152-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} default-amazonlinux-2-master-py3: {extends: '.test_instance'} -default-oraclelinux-8-master-py3: {extends: '.test_instance'} +# amazonlinux-2-master-py3: {extends: '.test_instance'} +# default-oraclelinux-8-master-py3: {extends: '.test_instance'} +# passenger-oraclelinux-8-master-py3: {extends: '.test_instance'} +oraclelinux-8-master-py3: {extends: '.test_instance'} default-oraclelinux-7-master-py3: {extends: '.test_instance'} +# oraclelinux-7-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} +# gentoo-stage3-latest-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} +# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-10-3002-5-py3: {extends: '.test_instance'} # default-debian-9-3002-5-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} @@ -162,6 +185,7 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'} default-arch-base-latest-3002-5-py3: {extends: '.test_instance'} +# arch-base-latest-3002-5-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index b33ce7b..905a129 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,22 +104,45 @@ jobs: # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 # - env: INSTANCE=default-oraclelinux-8-tiamat-py3 # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 - - env: INSTANCE=default-debian-10-master-py3 - - env: INSTANCE=default-debian-9-master-py3 - - env: INSTANCE=default-ubuntu-2004-master-py3 - - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=default-debian-10-master-py3 + # - env: INSTANCE=passenger-debian-10-master-py3 + - env: INSTANCE=debian-10-master-py3 + # - env: INSTANCE=default-debian-9-master-py3 + # - env: INSTANCE=passenger-debian-9-master-py3 + - env: INSTANCE=debian-9-master-py3 + # - env: INSTANCE=default-ubuntu-2004-master-py3 + # - env: INSTANCE=passenger-ubuntu-2004-master-py3 + - env: INSTANCE=ubuntu-2004-master-py3 + # - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=passenger-ubuntu-1804-master-py3 + - env: INSTANCE=ubuntu-1804-master-py3 - env: INSTANCE=default-ubuntu-1604-master-py3 - - env: INSTANCE=default-centos-8-master-py3 - - env: INSTANCE=default-centos-7-master-py3 + # - env: INSTANCE=ubuntu-1604-master-py3 + # - env: INSTANCE=default-centos-8-master-py3 + # - env: INSTANCE=passenger-centos-8-master-py3 + - env: INSTANCE=centos-8-master-py3 + # - env: INSTANCE=default-centos-7-master-py3 + # - env: INSTANCE=passenger-centos-7-master-py3 + - env: INSTANCE=centos-7-master-py3 - env: INSTANCE=default-fedora-33-master-py3 + # - env: INSTANCE=fedora-33-master-py3 - env: INSTANCE=default-fedora-32-master-py3 + # - env: INSTANCE=fedora-32-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3 + # - env: INSTANCE=opensuse-leap-152-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 + # - env: INSTANCE=opensuse-tmbl-latest-master-py3 - env: INSTANCE=default-amazonlinux-2-master-py3 - - env: INSTANCE=default-oraclelinux-8-master-py3 + # - env: INSTANCE=amazonlinux-2-master-py3 + # - env: INSTANCE=default-oraclelinux-8-master-py3 + # - env: INSTANCE=passenger-oraclelinux-8-master-py3 + - env: INSTANCE=oraclelinux-8-master-py3 - env: INSTANCE=default-oraclelinux-7-master-py3 + # - env: INSTANCE=oraclelinux-7-master-py3 # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 + # - env: INSTANCE=gentoo-stage3-latest-master-py3 - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 + # - env: INSTANCE=gentoo-stage3-systemd-master-py3 # - env: INSTANCE=default-debian-10-3002-5-py3 # - env: INSTANCE=default-debian-9-3002-5-py3 # - env: INSTANCE=default-ubuntu-2004-3002-5-py3 @@ -133,6 +156,7 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3002-5-py3 # - env: INSTANCE=default-oraclelinux-7-3002-5-py3 - env: INSTANCE=default-arch-base-latest-3002-5-py3 + # - env: INSTANCE=arch-base-latest-3002-5-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 diff --git a/.yamllint b/.yamllint index 73d532d..ab8dba2 100644 --- a/.yamllint +++ b/.yamllint @@ -14,8 +14,9 @@ ignore: | .cache/ .git/ node_modules/ - test/salt/**/*.sls + test/**/states/**/*.sls .kitchen/ + test/salt/passenger/pillar/nginx.sls yaml-files: # Default settings diff --git a/kitchen.yml b/kitchen.yml index f736542..a007d39 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -323,3 +323,27 @@ suites: verifier: inspec_tests: - path: test/integration/default + - name: passenger + includes: + - debian-10-master-py3 + - debian-9-master-py3 + - ubuntu-2004-master-py3 + - ubuntu-1804-master-py3 + - centos-8-master-py3 + - centos-7-master-py3 + - oraclelinux-8-master-py3 + provisioner: + state_top: + base: + '*': + - nginx.passenger + pillars: + top.sls: + base: + '*': + - nginx + pillars_from_files: + nginx.sls: test/salt/passenger/pillar/nginx.sls + verifier: + inspec_tests: + - path: test/integration/passenger diff --git a/test/integration/passenger/inspec.yml b/test/integration/passenger/inspec.yml index 08c695d..e42a794 100644 --- a/test/integration/passenger/inspec.yml +++ b/test/integration/passenger/inspec.yml @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- -name: default +name: passenger title: nginx formula maintainer: SaltStack Formulas license: Apache-2.0 @@ -10,3 +10,12 @@ supports: - platform-name: debian - platform-name: ubuntu - platform-name: centos + - platform-name: fedora + - platform-name: opensuse + - platform-name: suse + - platform-name: freebsd + - platform-name: amazon + - platform-name: oracle + - platform-name: arch + - platform-name: gentoo + - platform: windows From 8ea3c82be3fccb2bad8bac566f210454549d141e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Mar 2021 21:30:37 +0000 Subject: [PATCH 16/45] test: standardise use of `share` suite & `_mapdata` state [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/302 --- .rubocop.yml | 2 +- Gemfile | 2 +- kitchen.yml | 2 + nginx/_mapdata/_mapdata.jinja | 13 ++++ nginx/_mapdata/init.sls | 22 ++++++ test/integration/default/inspec.yml | 4 + test/integration/passenger/inspec.yml | 4 + test/integration/share/README.md | 22 ++++++ test/integration/share/inspec.yml | 22 ++++++ test/integration/share/libraries/system.rb | 90 ++++++++++++++++++++++ 10 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 nginx/_mapdata/_mapdata.jinja create mode 100644 nginx/_mapdata/init.sls create mode 100644 test/integration/share/README.md create mode 100644 test/integration/share/inspec.yml create mode 100644 test/integration/share/libraries/system.rb diff --git a/.rubocop.yml b/.rubocop.yml index 9367e99..2cceb73 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ Layout/LineLength: # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) Max: 88 Metrics/BlockLength: - ExcludedMethods: + IgnoredMethods: - control - describe # Increase from default of `25` diff --git a/Gemfile b/Gemfile index 15a77c3..c08ad6c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' # Use the latest version of `inspec` prior to `4.23.4`, which introduces a # regression where the diff isn't displayed when comparing using `eq`. gem 'inspec', '~> 4.22.22' -# Install the `kitchen-docker` gem from GitHub because the latest version +# Install the `kitchen-docker` gem using `git` because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' diff --git a/kitchen.yml b/kitchen.yml index a007d39..d137d21 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -312,6 +312,7 @@ suites: state_top: base: '*': + - nginx._mapdata - nginx pillars: top.sls: @@ -336,6 +337,7 @@ suites: state_top: base: '*': + - nginx._mapdata - nginx.passenger pillars: top.sls: diff --git a/nginx/_mapdata/_mapdata.jinja b/nginx/_mapdata/_mapdata.jinja new file mode 100644 index 0000000..aa9649c --- /dev/null +++ b/nginx/_mapdata/_mapdata.jinja @@ -0,0 +1,13 @@ +# yamllint disable rule:indentation rule:line-length +# {{ grains.get("osfinger", grains.os) }} +--- +{#- use salt.slsutil.serialize to avoid encoding errors on some platforms #} +{{ salt["slsutil.serialize"]( + "yaml", + map, + default_flow_style=False, + allow_unicode=True, + ) + | regex_replace("^\s+'$", "'", multiline=True) + | trim +}} diff --git a/nginx/_mapdata/init.sls b/nginx/_mapdata/init.sls new file mode 100644 index 0000000..650b3e8 --- /dev/null +++ b/nginx/_mapdata/init.sls @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls +--- +{#- Get the `tplroot` from `tpldir` #} +{%- set tplroot = tpldir.split("/")[0] %} +{%- from tplroot ~ "/map.jinja" import nginx with context %} + +{%- set _mapdata = { + "values": nginx, + } %} +{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %} + +{%- set output_dir = "/temp" if grains.os_family == "Windows" else "/tmp" %} +{%- set output_file = output_dir ~ "/salt_mapdata_dump.yaml" %} + +{{ tplroot }}-mapdata-dump: + file.managed: + - name: {{ output_file }} + - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja + - template: jinja + - context: + map: {{ _mapdata | yaml }} diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 8647404..9c0d834 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -6,6 +6,9 @@ title: nginx formula maintainer: SaltStack Formulas license: Apache-2.0 summary: Verify that the nginx formula is setup and configured correctly +depends: + - name: share + path: test/integration/share supports: - platform-name: debian - platform-name: ubuntu @@ -14,6 +17,7 @@ supports: - platform-name: opensuse - platform-name: suse - platform-name: freebsd + - platform-name: openbsd - platform-name: amazon - platform-name: oracle - platform-name: arch diff --git a/test/integration/passenger/inspec.yml b/test/integration/passenger/inspec.yml index e42a794..02ea98d 100644 --- a/test/integration/passenger/inspec.yml +++ b/test/integration/passenger/inspec.yml @@ -6,6 +6,9 @@ title: nginx formula maintainer: SaltStack Formulas license: Apache-2.0 summary: Verify that the nginx formula is setup and configured correctly +depends: + - name: share + path: test/integration/share supports: - platform-name: debian - platform-name: ubuntu @@ -14,6 +17,7 @@ supports: - platform-name: opensuse - platform-name: suse - platform-name: freebsd + - platform-name: openbsd - platform-name: amazon - platform-name: oracle - platform-name: arch diff --git a/test/integration/share/README.md b/test/integration/share/README.md new file mode 100644 index 0000000..5c5785b --- /dev/null +++ b/test/integration/share/README.md @@ -0,0 +1,22 @@ +# InSpec Profile: `share` + +This shows the implementation of the `share` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). + +Its goal is to share the libraries between all profiles. + +## Libraries + +### `system` + +The `system` library provides easy access to system dependent information: + +- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective + - `system.platform[:family]` provide a family name for Arch and Gentoo + - `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows` + - `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo, openSUSE and Windows: + - `Arch` is always `base-latest` + - `Amazon Linux` release `2018` is resolved as `1` + - `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`) + - `openSUSE` is resolved as `tumbleweed` if the `platform[:release]` is in date format + - `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version + - `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example) diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml new file mode 100644 index 0000000..cf623a1 --- /dev/null +++ b/test/integration/share/inspec.yml @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: share +title: InSpec shared resources +maintainer: SaltStack Formulas +license: Apache-2.0 +summary: shared resources +supports: + - platform-name: debian + - platform-name: ubuntu + - platform-name: centos + - platform-name: fedora + - platform-name: opensuse + - platform-name: suse + - platform-name: freebsd + - platform-name: openbsd + - platform-name: amazon + - platform-name: oracle + - platform-name: arch + - platform-name: gentoo + - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb new file mode 100644 index 0000000..461dea4 --- /dev/null +++ b/test/integration/share/libraries/system.rb @@ -0,0 +1,90 @@ +# frozen_string_literal: true + +# system.rb -- InSpec resources for system values +# Author: Daniel Dehennin +# Copyright (C) 2020 Daniel Dehennin + +class SystemResource < Inspec.resource(1) + name 'system' + + attr_reader :platform + + def initialize + super + @platform = build_platform + end + + private + + def build_platform + { + family: build_platform_family, + name: build_platform_name, + release: build_platform_release, + finger: build_platform_finger + } + end + + def build_platform_family + case inspec.platform[:name] + when 'arch', 'gentoo' + inspec.platform[:name] + else + inspec.platform[:family] + end + end + + def build_platform_name + case inspec.platform[:name] + when 'amazon', 'oracle' + "#{inspec.platform[:name]}linux" + when /^windows_/ + inspec.platform[:family] + else + inspec.platform[:name] + end + end + + # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity + def build_platform_release + case inspec.platform[:name] + when 'amazon' + # `2018` relase is named `1` in kitchen.yaml + inspec.platform[:release].gsub(/2018.*/, '1') + when 'arch' + 'base-latest' + when 'gentoo' + "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" + when 'opensuse' + # rubocop:disable Style/NumericLiterals,Layout/LineLength + inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release] + # rubocop:enable Style/NumericLiterals,Layout/LineLength + when 'windows_8.1_pro' + '8.1' + when 'windows_server_2019_datacenter' + '2019-server' + when 'windows_server_2016_datacenter' + '2016-server' + else + inspec.platform[:release] + end + end + # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity + + def derive_gentoo_init_system + inspec.command('systemctl').exist? ? 'sysd' : 'sysv' + end + + def build_platform_finger + "#{build_platform_name}-#{build_finger_release}" + end + + def build_finger_release + case inspec.platform[:name] + when 'ubuntu' + build_platform_release.split('.').slice(0, 2).join('.') + else + build_platform_release.split('.')[0] + end + end +end From 05994e1b174ccdf3ff4a444f81314ad925fa478d Mon Sep 17 00:00:00 2001 From: Tobias Jungel Date: Sat, 13 Mar 2021 21:54:07 +0100 Subject: [PATCH 17/45] fix(servers_config): remove service depedency * servers_config should run without service dependency. Service is managed in servers.sls. * dropped nginx_service_reload in favor of extending nginx_service * wait for all file states (create and delete) * create dirs for symlinked files --- nginx/servers.sls | 26 +++++++++++--------------- nginx/servers_config.sls | 9 +++------ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/nginx/servers.sls b/nginx/servers.sls index f3033bb..8108b15 100644 --- a/nginx/servers.sls +++ b/nginx/servers.sls @@ -5,12 +5,11 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ '/map.jinja' import nginx, sls_block with context %} {%- from tplroot ~ '/servers_config.sls' import server_states with context %} -{%- from tplroot ~ '/service.sls' import service_function with context %} {% macro file_requisites(states) %} - {%- for state in states %} - - file: {{ state }} - {%- endfor -%} +{%- for state in states %} + - file: {{ state }} +{%- endfor -%} {% endmacro %} include: @@ -18,15 +17,12 @@ include: - nginx.servers_config {% if server_states|length() > 0 %} -nginx_service_reload: - service.{{ service_function }}: - - name: {{ nginx.lookup.service }} - - reload: True - - use: - - service: nginx_service - - listen: - {{ file_requisites(server_states) }} - - require: - {{ file_requisites(server_states) }} - - service: nginx_service +extend: + nginx_service: + service: + - reload: True + - require: + {{ file_requisites(server_states) }} + - listen: + {{ file_requisites(server_states) }} {% endif %} diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 3d86d1a..6666810 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -52,6 +52,7 @@ file.symlink: {{ sls_block(nginx.servers.symlink_opts) }} - name: {{ server_path(server, state) }} + - makedirs: True - target: {{ server_path(server, anti_state) }} {%- else %} {%- if deleted == True %} @@ -125,8 +126,6 @@ nginx_server_available_dir: }} - makedirs: True - template: jinja - - require_in: - - service: nginx_service {% if 'source_path' not in settings.config %} - context: config: {{ settings.config|json(sort_keys=False) }} @@ -136,9 +135,9 @@ nginx_server_available_dir: - unless: - test -e {{ server_curpath(server) }} {% endif %} +{% endif %} +{% endif %} {% do server_states.append(conf_state_id) %} -{% endif %} -{% endif %} {% if settings.enabled != None %} {% set status_state_id = 'server_state_' ~ loop.index0 %} @@ -156,9 +155,7 @@ nginx_server_available_dir: - file: {{ conf_state_id }} {% endif %} -{% if 'deleted' not in settings or ( 'deleted' in settings and settings.deleted == False ) %} {% do server_states.append(status_state_id) %} -{% endif %} {%- endif %} {# enabled != available_dir #} {% endif %} {% endfor %} From 3825557070a18db4828cc634dd036a428f8a9836 Mon Sep 17 00:00:00 2001 From: Tobias Jungel Date: Fri, 26 Mar 2021 21:41:22 +0100 Subject: [PATCH 18/45] refactor(servers_config): remove unused loop --- nginx/servers_config.sls | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 6666810..915ac1c 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -99,10 +99,6 @@ nginx_server_available_dir: - clean: {{ nginx.servers.purge_servers_config }} {%- endif %} -# Manage the actual server files -{% for server, settings in nginx.servers.managed.items() %} -{% endfor %} - # Managed enabled/disabled state for servers {% for server, settings in nginx.servers.managed.items() %} {% set conf_state_id = 'server_conf_' ~ loop.index0 %} From 3722991fded5262eafb294b7620f82db569b6e79 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 29 Mar 2021 14:25:37 +0000 Subject: [PATCH 19/45] chore(release): 2.6.1 [skip ci] ## [2.6.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.0...v2.6.1) (2021-03-29) ### Bug Fixes * **servers_config:** remove service depedency ([05994e1](https://github.com/saltstack-formulas/nginx-formula/commit/05994e1b174ccdf3ff4a444f81314ad925fa478d)) ### Code Refactoring * **servers_config:** remove unused loop ([3825557](https://github.com/saltstack-formulas/nginx-formula/commit/3825557070a18db4828cc634dd036a428f8a9836)) ### Continuous Integration * **kitchen+ci:** include `passenger` suite [skip ci] ([0bbe686](https://github.com/saltstack-formulas/nginx-formula/commit/0bbe68619fdf3791e6202ce3f17ca03efc4441c1)) ### Tests * standardise use of `share` suite & `_mapdata` state [skip ci] ([8ea3c82](https://github.com/saltstack-formulas/nginx-formula/commit/8ea3c82be3fccb2bad8bac566f210454549d141e)) --- AUTHORS.md | 7 ++++--- CHANGELOG.md | 22 ++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 9 ++++++--- docs/CHANGELOG.rst | 27 +++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 7 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index c7321bf..063c504 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,13 +4,13 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|90 +@myii|[@myii](https://github.com/myii)|92 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|13 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|14 @ross-p|[@ross-p](https://github.com/ross-p)|13 @daks|[@daks](https://github.com/daks)|11 @techhat|[@techhat](https://github.com/techhat)|10 @@ -49,6 +49,7 @@ Avatar|Contributor|Contributions @garrettw|[@garrettw](https://github.com/garrettw)|2 @ErisDS|[@ErisDS](https://github.com/ErisDS)|2 @myoung34|[@myoung34](https://github.com/myoung34)|2 +@toanju|[@toanju](https://github.com/toanju)|2 @sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @bebosudo|[@bebosudo](https://github.com/bebosudo)|1 @aanriot|[@aanriot](https://github.com/aanriot)|1 @@ -80,4 +81,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-11. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-29. diff --git a/CHANGELOG.md b/CHANGELOG.md index 477a4c2..3d37ac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [2.6.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.0...v2.6.1) (2021-03-29) + + +### Bug Fixes + +* **servers_config:** remove service depedency ([05994e1](https://github.com/saltstack-formulas/nginx-formula/commit/05994e1b174ccdf3ff4a444f81314ad925fa478d)) + + +### Code Refactoring + +* **servers_config:** remove unused loop ([3825557](https://github.com/saltstack-formulas/nginx-formula/commit/3825557070a18db4828cc634dd036a428f8a9836)) + + +### Continuous Integration + +* **kitchen+ci:** include `passenger` suite [skip ci] ([0bbe686](https://github.com/saltstack-formulas/nginx-formula/commit/0bbe68619fdf3791e6202ce3f17ca03efc4441c1)) + + +### Tests + +* standardise use of `share` suite & `_mapdata` state [skip ci] ([8ea3c82](https://github.com/saltstack-formulas/nginx-formula/commit/8ea3c82be3fccb2bad8bac566f210454549d141e)) + # [2.6.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.5.0...v2.6.0) (2021-03-11) diff --git a/FORMULA b/FORMULA index bbee674..dce494c 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.6.0 +version: 2.6.1 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 50d6656..83dba12 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 90 + - 92 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -33,7 +33,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 17 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 13 + - 14 * - :raw-html-m2r:`@ross-p` - `@ross-p `_ - 13 @@ -148,6 +148,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@myoung34` - `@myoung34 `_ - 2 + * - :raw-html-m2r:`@toanju` + - `@toanju `_ + - 2 * - :raw-html-m2r:`@sticky-note` - `@sticky-note `_ - 2 @@ -236,4 +239,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-11. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-29. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 6a5a3e8..bc5b776 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog ========= +`2.6.1 `_ (2021-03-29) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **servers_config:** remove service depedency (\ `05994e1 `_\ ) + +Code Refactoring +^^^^^^^^^^^^^^^^ + + +* **servers_config:** remove unused loop (\ `3825557 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+ci:** include ``passenger`` suite [skip ci] (\ `0bbe686 `_\ ) + +Tests +^^^^^ + + +* standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `8ea3c82 `_\ ) + `2.6.0 `_ (2021-03-11) ------------------------------------------------------------------------------------------------------- From c03729ae326876a20cb22c346f9d4cd96418af9a Mon Sep 17 00:00:00 2001 From: Tobias Jungel Date: Tue, 30 Mar 2021 01:42:27 +0200 Subject: [PATCH 20/45] fix(servers_config): fixup 05994e1 --- nginx/servers_config.sls | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 915ac1c..09aec68 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -106,6 +106,7 @@ nginx_server_available_dir: {{ conf_state_id }}: file.absent: - name: {{ server_curpath(server) }} +{% do server_states.append(conf_state_id) %} {% else %} {% if settings.enabled == True %} {{ conf_state_id }}: @@ -131,9 +132,9 @@ nginx_server_available_dir: - unless: - test -e {{ server_curpath(server) }} {% endif %} -{% endif %} -{% endif %} {% do server_states.append(conf_state_id) %} +{% endif %} +{% endif %} {% if settings.enabled != None %} {% set status_state_id = 'server_state_' ~ loop.index0 %} From 1e5cd1108ebd86ead4f15177d8b1c0378ee48296 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 30 Mar 2021 18:02:24 +0000 Subject: [PATCH 21/45] chore(release): 2.6.2 [skip ci] ## [2.6.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.1...v2.6.2) (2021-03-30) ### Bug Fixes * **servers_config:** fixup 05994e1 ([c03729a](https://github.com/saltstack-formulas/nginx-formula/commit/c03729ae326876a20cb22c346f9d4cd96418af9a)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 10 +++++----- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 063c504..e977dd5 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|92 +@myii|[@myii](https://github.com/myii)|93 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @@ -37,6 +37,7 @@ Avatar|Contributor|Contributions @msciciel|[@msciciel](https://github.com/msciciel)|3 @rfairburn|[@rfairburn](https://github.com/rfairburn)|3 @westurner|[@westurner](https://github.com/westurner)|3 +@toanju|[@toanju](https://github.com/toanju)|3 @chris-sanders|[@chris-sanders](https://github.com/chris-sanders)|2 @UtahDave|[@UtahDave](https://github.com/UtahDave)|2 @ghtyrant|[@ghtyrant](https://github.com/ghtyrant)|2 @@ -49,7 +50,6 @@ Avatar|Contributor|Contributions @garrettw|[@garrettw](https://github.com/garrettw)|2 @ErisDS|[@ErisDS](https://github.com/ErisDS)|2 @myoung34|[@myoung34](https://github.com/myoung34)|2 -@toanju|[@toanju](https://github.com/toanju)|2 @sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @bebosudo|[@bebosudo](https://github.com/bebosudo)|1 @aanriot|[@aanriot](https://github.com/aanriot)|1 @@ -81,4 +81,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-29. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-30. diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d37ac7..1534800 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.6.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.1...v2.6.2) (2021-03-30) + + +### Bug Fixes + +* **servers_config:** fixup 05994e1 ([c03729a](https://github.com/saltstack-formulas/nginx-formula/commit/c03729ae326876a20cb22c346f9d4cd96418af9a)) + ## [2.6.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.0...v2.6.1) (2021-03-29) diff --git a/FORMULA b/FORMULA index dce494c..77009be 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.6.1 +version: 2.6.2 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 83dba12..7ec1d38 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 92 + - 93 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -112,6 +112,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@westurner` - `@westurner `_ - 3 + * - :raw-html-m2r:`@toanju` + - `@toanju `_ + - 3 * - :raw-html-m2r:`@chris-sanders` - `@chris-sanders `_ - 2 @@ -148,9 +151,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@myoung34` - `@myoung34 `_ - 2 - * - :raw-html-m2r:`@toanju` - - `@toanju `_ - - 2 * - :raw-html-m2r:`@sticky-note` - `@sticky-note `_ - 2 @@ -239,4 +239,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-29. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-30. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index bc5b776..1e241bc 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`2.6.2 `_ (2021-03-30) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **servers_config:** fixup 05994e1 (\ `c03729a `_\ ) + `2.6.1 `_ (2021-03-29) ------------------------------------------------------------------------------------------------------- From 4cd351adbc184b938b0d0cf587419bab5b39a7d3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 3 Apr 2021 09:41:50 +0100 Subject: [PATCH 22/45] fix(freebsd): add `openssl` pkg and update all `default` tests --- nginx/map.jinja | 1 + test/integration/default/controls/config.rb | 47 ++++++++++++--------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/nginx/map.jinja b/nginx/map.jinja index 5b3e1bd..77b41ca 100644 --- a/nginx/map.jinja +++ b/nginx/map.jinja @@ -105,6 +105,7 @@ 'server_enabled': '/usr/local/etc/nginx/sites-enabled', 'snippets_dir': '/usr/local/etc/nginx/snippets', 'server_use_symlink': True, + 'openssl_package': 'openssl', 'pid_file': '/var/run/nginx.pid', }, }, default='Debian' ), diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 1a405ff..6d7c999 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -2,27 +2,36 @@ # Set defaults, use debian as base -server_available = '/etc/nginx/sites-available' -server_enabled = '/etc/nginx/sites-enabled' - # Override by platform family -case platform[:family] -when 'redhat', 'fedora' - server_available = '/etc/nginx/conf.d' - server_enabled = '/etc/nginx/conf.d' -when 'suse' - server_available = '/etc/nginx/vhosts.d' - server_enabled = '/etc/nginx/vhosts.d' -end +server_available, server_enabled = + case platform[:family] + when 'redhat', 'fedora' + %w[/etc/nginx/conf.d /etc/nginx/conf.d] + when 'suse' + %w[/etc/nginx/vhosts.d /etc/nginx/vhosts.d] + when 'bsd' + %w[/usr/local/etc/nginx/sites-available /usr/local/etc/nginx/sites-enabled] + else + %w[/etc/nginx/sites-available /etc/nginx/sites-enabled] + end + +nginx_conf, snippets_letsencrypt_conf, file_owner, file_group = + case platform[:family] + when 'bsd' + %w[/usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/snippets/letsencrypt.conf + root wheel] + else + %w[/etc/nginx/nginx.conf /etc/nginx/snippets/letsencrypt.conf root root] + end control 'Nginx configuration' do title 'should match desired lines' # main configuration - describe file('/etc/nginx/nginx.conf') do + describe file(nginx_conf) do it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } + it { should be_owned_by file_owner } + it { should be_grouped_into file_group } its('mode') { should cmp '0644' } its('content') do # rubocop:disable Metrics/LineLength @@ -34,10 +43,10 @@ control 'Nginx configuration' do end # snippets configuration - describe file('/etc/nginx/snippets/letsencrypt.conf') do + describe file(snippets_letsencrypt_conf) do it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } + it { should be_owned_by file_owner } + it { should be_grouped_into file_group } its('mode') { should cmp '0644' } its('content') { should include 'location ^~ /.well-known/acme-challenge/ {' } its('content') { should include 'proxy_pass http://localhost:9999;' } @@ -52,8 +61,8 @@ control 'Nginx configuration' do describe file "#{dir}/mysite" do it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } + it { should be_owned_by file_owner } + it { should be_grouped_into file_group } its('mode') { should cmp '0644' } its('content') { should include 'server_name localhost;' } its('content') { should include 'listen 80 default_server;' } From c79ce9a9ae30e889ab925bb0398008b434bc9b0a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 3 Apr 2021 09:23:08 +0100 Subject: [PATCH 23/45] ci: enable Vagrant-based testing using GitHub Actions * Semi-automated using https://github.com/myii/ssf-formula/pull/308 --- .github/workflows/kitchen.vagrant.yml | 36 +++++++++++++++++++++++++++ .pre-commit-config.yaml | 8 ++++++ .travis.yml | 21 ++++------------ Gemfile | 4 +++ Gemfile.lock | 3 +++ kitchen.vagrant.yml | 23 +++++++++++++++++ kitchen.yml | 28 +++++++++++++++++++++ 7 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/kitchen.vagrant.yml create mode 100644 kitchen.vagrant.yml diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml new file mode 100644 index 0000000..2dac76a --- /dev/null +++ b/.github/workflows/kitchen.vagrant.yml @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: 'Kitchen Vagrant (FreeBSD)' +'on': ['push', 'pull_request'] + +env: + KITCHEN_LOCAL_YAML: 'kitchen.vagrant.yml' + +jobs: + test: + runs-on: 'macos-10.15' + strategy: + fail-fast: false + matrix: + instance: + - default-freebsd-122-latest-py3 + # - freebsd-122-latest-py3 + - default-freebsd-114-latest-py3 + # - freebsd-114-latest-py3 + steps: + - name: 'Check out code' + uses: 'actions/checkout@v2' + - name: 'Set up Bundler cache' + uses: 'actions/cache@v1' + with: + path: 'vendor/bundle' + key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}" + restore-keys: "${{ runner.os }}-gems-" + - name: 'Run Bundler' + run: | + ruby --version + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 + - name: 'Run Test Kitchen' + run: 'bundle exec kitchen verify ${{ matrix.instance }}' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 53a837e..ea8271b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,6 +17,14 @@ repos: stages: [manual] additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true + - repo: https://github.com/rubocop-hq/rubocop + rev: v1.9.1 + hooks: + - id: rubocop + name: Check Ruby files with rubocop + args: [--debug] + always_run: true + pass_filenames: false - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.7.1.1 hooks: diff --git a/.travis.yml b/.travis.yml index 905a129..eae765c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,17 +36,14 @@ stages: # - name: 'release' # if: 'branch = master AND type != pull_request' jobs: - allow_failures: - - env: Lint_rubocop - fast_finish: true include: ## Define the test stage that runs the linters (and testing matrix, if applicable) - # Run all of the linters in a single job (except `rubocop`) + # Run all of the linters in a single job - language: 'node_js' node_js: 'lts/*' env: 'Lint' - name: 'Lint: salt-lint, yamllint, shellcheck & commitlint' + name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint' before_install: 'skip' script: # Install and run `salt-lint` @@ -57,6 +54,9 @@ jobs: # Need at least `v1.17.0` for the `yaml-files` setting - pip install --user yamllint>=1.17.0 - yamllint -s . + # Install and run `rubocop` + - gem install rubocop + - rubocop -d # Run `shellcheck` (already pre-installed in Travis) - shellcheck --version - git ls-files -- '*.sh' '*.bash' '*.ksh' @@ -65,17 +65,6 @@ jobs: - npm i -D @commitlint/config-conventional @commitlint/travis-cli - commitlint-travis - # Run the `rubocop` linter in a separate job that is allowed to fail - # Once these lint errors are fixed, this can be merged into a single job - - language: node_js - node_js: lts/* - env: Lint_rubocop - name: 'Lint: rubocop' - before_install: skip - script: - # Install and run `rubocop` - - gem install rubocop - - rubocop -d # Run `pre-commit` linters in a single job - language: 'python' diff --git a/Gemfile b/Gemfile index c08ad6c..8be107e 100644 --- a/Gemfile +++ b/Gemfile @@ -12,3 +12,7 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure # rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' + +group :vagrant do + gem 'kitchen-vagrant' +end diff --git a/Gemfile.lock b/Gemfile.lock index d7cbc3b..ef26d96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,6 +292,8 @@ GEM kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) + kitchen-vagrant (1.7.0) + test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) license-acceptance (1.0.19) pastel (~> 0.7) @@ -525,6 +527,7 @@ DEPENDENCIES kitchen-docker! kitchen-inspec (>= 2.2.1) kitchen-salt (>= 0.6.3) + kitchen-vagrant BUNDLED WITH 2.1.2 diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml new file mode 100644 index 0000000..cb9c6d9 --- /dev/null +++ b/kitchen.vagrant.yml @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +driver: + name: vagrant + cache_directory: false + customize: + usbxhci: 'off' + gui: false + linked_clone: true + ssh: + shell: /bin/sh + +platforms: + - name: freebsd-122-latest-py3 + driver: + box: bento/freebsd-12.2 + - name: freebsd-114-latest-py3 + driver: + box: bento/freebsd-11.4 + +provisioner: + salt_install: bootstrap diff --git a/kitchen.yml b/kitchen.yml index d137d21..b505c9b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -326,6 +326,13 @@ suites: - path: test/integration/default - name: passenger includes: + - debian-10-tiamat-py3 + - debian-9-tiamat-py3 + - ubuntu-2004-tiamat-py3 + - ubuntu-1804-tiamat-py3 + - centos-8-tiamat-py3 + - centos-7-tiamat-py3 + - oraclelinux-8-tiamat-py3 - debian-10-master-py3 - debian-9-master-py3 - ubuntu-2004-master-py3 @@ -333,6 +340,27 @@ suites: - centos-8-master-py3 - centos-7-master-py3 - oraclelinux-8-master-py3 + - debian-10-3002-5-py3 + - debian-9-3002-5-py3 + - ubuntu-2004-3002-5-py3 + - ubuntu-1804-3002-5-py3 + - centos-8-3002-5-py3 + - centos-7-3002-5-py3 + - oraclelinux-8-3002-5-py3 + - debian-10-3001-6-py3 + - debian-9-3001-6-py3 + - ubuntu-2004-3001-6-py3 + - ubuntu-1804-3001-6-py3 + - centos-8-3001-6-py3 + - centos-7-3001-6-py3 + - oraclelinux-8-3001-6-py3 + - debian-10-3000-8-py3 + - debian-9-3000-8-py3 + - ubuntu-1804-3000-8-py3 + - centos-8-3000-8-py3 + - centos-7-3000-8-py3 + - oraclelinux-8-3000-8-py3 + - ubuntu-1804-3000-8-py2 provisioner: state_top: base: From 13591c61c5e80c7d5cc8e75e66c08f1c01ba0307 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 3 Apr 2021 12:36:54 +0000 Subject: [PATCH 24/45] chore(release): 2.6.3 [skip ci] ## [2.6.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.2...v2.6.3) (2021-04-03) ### Bug Fixes * **freebsd:** add `openssl` pkg and update all `default` tests ([4cd351a](https://github.com/saltstack-formulas/nginx-formula/commit/4cd351adbc184b938b0d0cf587419bab5b39a7d3)) ### Continuous Integration * enable Vagrant-based testing using GitHub Actions ([c79ce9a](https://github.com/saltstack-formulas/nginx-formula/commit/c79ce9a9ae30e889ab925bb0398008b434bc9b0a)) --- AUTHORS.md | 4 ++-- CHANGELOG.md | 12 ++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 4 ++-- docs/CHANGELOG.rst | 15 +++++++++++++++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index e977dd5..8e933e7 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|93 +@myii|[@myii](https://github.com/myii)|96 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @@ -81,4 +81,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-30. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-03. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1534800..f8455f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.6.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.2...v2.6.3) (2021-04-03) + + +### Bug Fixes + +* **freebsd:** add `openssl` pkg and update all `default` tests ([4cd351a](https://github.com/saltstack-formulas/nginx-formula/commit/4cd351adbc184b938b0d0cf587419bab5b39a7d3)) + + +### Continuous Integration + +* enable Vagrant-based testing using GitHub Actions ([c79ce9a](https://github.com/saltstack-formulas/nginx-formula/commit/c79ce9a9ae30e889ab925bb0398008b434bc9b0a)) + ## [2.6.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.1...v2.6.2) (2021-03-30) diff --git a/FORMULA b/FORMULA index 77009be..a7779b5 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.6.2 +version: 2.6.3 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 7ec1d38..8d9701d 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 93 + - 96 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -239,4 +239,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-30. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-04-03. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 1e241bc..7158a54 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`2.6.3 `_ (2021-04-03) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **freebsd:** add ``openssl`` pkg and update all ``default`` tests (\ `4cd351a `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* enable Vagrant-based testing using GitHub Actions (\ `c79ce9a `_\ ) + `2.6.2 `_ (2021-03-30) ------------------------------------------------------------------------------------------------------- From 57278481de489441a5c04aee544962212e91c5af Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 3 Apr 2021 13:22:21 +0100 Subject: [PATCH 25/45] docs(readme): add `Testing with Vagrant` section [skip ci] --- docs/README.rst | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/docs/README.rst b/docs/README.rst index 7451490..78148a4 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -169,3 +169,65 @@ Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``veri ^^^^^^^^^^^^^^^^^^^^^ Gives you SSH access to the instance for manual testing. + +Testing with Vagrant +-------------------- + +Windows/FreeBSD/OpenBSD testing is done with ``kitchen-salt``. + +Requirements +^^^^^^^^^^^^ + +* Ruby +* Virtualbox +* Vagrant + +Setup +^^^^^ + +.. code-block:: bash + + $ gem install bundler + $ bundle install --with=vagrant + $ bin/kitchen test [platform] + +Where ``[platform]`` is the platform name defined in ``kitchen.vagrant.yml``, +e.g. ``windows-81-latest-py3``. + +Note +^^^^ + +When testing using Vagrant you must set the environment variable ``KITCHEN_LOCAL_YAML`` to ``kitchen.vagrant.yml``. For example: + +.. code-block:: bash + + $ KITCHEN_LOCAL_YAML=kitchen.vagrant.yml bin/kitchen test # Alternatively, + $ export KITCHEN_LOCAL_YAML=kitchen.vagrant.yml + $ bin/kitchen test + +Then run the following commands as needed. + +``bin/kitchen converge`` +^^^^^^^^^^^^^^^^^^^^^^^^ + +Creates the Vagrant instance and runs the ``nginx`` main state, ready for testing. + +``bin/kitchen verify`` +^^^^^^^^^^^^^^^^^^^^^^ + +Runs the ``inspec`` tests on the actual instance. + +``bin/kitchen destroy`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Removes the Vagrant instance. + +``bin/kitchen test`` +^^^^^^^^^^^^^^^^^^^^ + +Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``verify`` + ``destroy``. + +``bin/kitchen login`` +^^^^^^^^^^^^^^^^^^^^^ + +Gives you RDP/SSH access to the instance for manual testing. From 5f8afeec97572bbfe4e2e8fa5f5701de57fc53f7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Apr 2021 18:19:59 +0100 Subject: [PATCH 26/45] chore: update `CODEOWNERS` & `.yamllint` re: `kitchen-vagrant` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/310 --- .yamllint | 2 ++ CODEOWNERS | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.yamllint b/.yamllint index ab8dba2..f9a94a4 100644 --- a/.yamllint +++ b/.yamllint @@ -10,12 +10,14 @@ extends: 'default' # 3. All YAML files under directory `node_modules/`, introduced during the Travis run # 4. Any SLS files under directory `test/`, which are actually state files # 5. Any YAML files under directory `.kitchen/`, introduced during local testing +# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax ignore: | .cache/ .git/ node_modules/ test/**/states/**/*.sls .kitchen/ + kitchen.vagrant.yml test/salt/passenger/pillar/nginx.sls yaml-files: diff --git a/CODEOWNERS b/CODEOWNERS index ad24c19..2dd5bf8 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -39,6 +39,8 @@ /Gemfile @saltstack-formulas/ssf /Gemfile.lock @saltstack-formulas/ssf /kitchen.yml @saltstack-formulas/ssf +/kitchen.vagrant.yml @saltstack-formulas/ssf +/kitchen.windows.yml @saltstack-formulas/ssf /pre-commit_semantic-release.sh @saltstack-formulas/ssf /release-rules.js @saltstack-formulas/ssf /release.config.js @saltstack-formulas/ssf From b9e9cd38e6d29b7eb4cd8ae74a1bdf901959dee3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Apr 2021 18:54:26 +0100 Subject: [PATCH 27/45] ci(vagrant): use pre-salted boxes & conditional local settings [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/311 --- .github/workflows/kitchen.vagrant.yml | 10 ++++++---- kitchen.vagrant.yml | 25 +++++++++++++++++-------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 2dac76a..4f84767 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -14,10 +14,12 @@ jobs: fail-fast: false matrix: instance: - - default-freebsd-122-latest-py3 - # - freebsd-122-latest-py3 - - default-freebsd-114-latest-py3 - # - freebsd-114-latest-py3 + - default-freebsd-122-master-py3 + # - freebsd-122-master-py3 + - default-freebsd-114-master-py3 + # - freebsd-114-master-py3 + # - default-freebsd-122-3002-6-py3 + # - default-freebsd-114-3002-6-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index cb9c6d9..6ca8287 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -7,17 +7,26 @@ driver: customize: usbxhci: 'off' gui: false - linked_clone: true ssh: shell: /bin/sh + <% unless ENV['CI'] %> + linked_clone: true + synced_folders: + - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant' + - '/vagrant' + - 'create: true, disabled: false' + <% end %> platforms: - - name: freebsd-122-latest-py3 + - name: freebsd-122-master-py3 driver: - box: bento/freebsd-12.2 - - name: freebsd-114-latest-py3 + box: myii/freebsd-12.2-master-py3 + - name: freebsd-114-master-py3 driver: - box: bento/freebsd-11.4 - -provisioner: - salt_install: bootstrap + box: myii/freebsd-11.4-master-py3 + - name: freebsd-122-3002-6-py3 + driver: + box: myii/freebsd-12.2-3002.6-py3 + - name: freebsd-114-3002-6-py3 + driver: + box: myii/freebsd-11.4-3002.6-py3 From b41062e3b19c4c109198bd95c53158d871bbff85 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 19 Apr 2021 09:39:58 +0100 Subject: [PATCH 28/45] ci(vagrant): add FreeBSD 13.0 [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/316 --- .github/workflows/kitchen.vagrant.yml | 3 +++ kitchen.vagrant.yml | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 4f84767..9d34048 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -14,10 +14,13 @@ jobs: fail-fast: false matrix: instance: + - default-freebsd-130-master-py3 + # - freebsd-130-master-py3 - default-freebsd-122-master-py3 # - freebsd-122-master-py3 - default-freebsd-114-master-py3 # - freebsd-114-master-py3 + # - default-freebsd-130-3002-6-py3 # - default-freebsd-122-3002-6-py3 # - default-freebsd-114-3002-6-py3 steps: diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 6ca8287..542ba90 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -18,12 +18,20 @@ driver: <% end %> platforms: + - name: freebsd-130-master-py3 + driver: + box: myii/freebsd-13.0-master-py3 + synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 - name: freebsd-122-master-py3 driver: box: myii/freebsd-12.2-master-py3 - name: freebsd-114-master-py3 driver: box: myii/freebsd-11.4-master-py3 + - name: freebsd-130-3002-6-py3 + driver: + box: myii/freebsd-13.0-3002.6-py3 + synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 - name: freebsd-122-3002-6-py3 driver: box: myii/freebsd-12.2-3002.6-py3 From 46faf4e24b39f7d4fd138126dbe5eb6a06eb5b67 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 23 Apr 2021 08:47:33 +0100 Subject: [PATCH 29/45] ci(kitchen+gitlab): adjust matrix to add `3003` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/318 --- .gitlab-ci.yml | 103 ++++++++++------- kitchen.yml | 291 ++++++++++++++++++++++++++++++------------------- 2 files changed, 242 insertions(+), 152 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67978ff..a19274b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,6 +153,8 @@ centos-8-master-py3: {extends: '.test_instance'} # default-centos-7-master-py3: {extends: '.test_instance'} # passenger-centos-7-master-py3: {extends: '.test_instance'} centos-7-master-py3: {extends: '.test_instance'} +default-fedora-34-master-py3: {extends: '.test_instance'} +# fedora-34-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} # fedora-33-master-py3: {extends: '.test_instance'} default-fedora-32-master-py3: {extends: '.test_instance'} @@ -172,56 +174,73 @@ default-oraclelinux-7-master-py3: {extends: '.test_instance'} # gentoo-stage3-latest-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} -# default-debian-10-3002-5-py3: {extends: '.test_instance'} -# default-debian-9-3002-5-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} -# default-centos-8-3002-5-py3: {extends: '.test_instance'} -# default-centos-7-3002-5-py3: {extends: '.test_instance'} -# default-fedora-33-3002-5-py3: {extends: '.test_instance'} -# default-fedora-32-3002-5-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'} -default-arch-base-latest-3002-5-py3: {extends: '.test_instance'} -# arch-base-latest-3002-5-py3: {extends: '.test_instance'} +# default-debian-10-3003-0-py3: {extends: '.test_instance'} +# default-debian-9-3003-0-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} +# default-centos-8-3003-0-py3: {extends: '.test_instance'} +# default-centos-7-3003-0-py3: {extends: '.test_instance'} +# default-fedora-34-3003-0-py3: {extends: '.test_instance'} +# default-fedora-33-3003-0-py3: {extends: '.test_instance'} +# default-fedora-32-3003-0-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} +default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} +# arch-base-latest-3003-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} +# default-debian-10-3002-6-py3: {extends: '.test_instance'} +# default-debian-9-3002-6-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} +# default-centos-8-3002-6-py3: {extends: '.test_instance'} +# default-centos-7-3002-6-py3: {extends: '.test_instance'} +# default-fedora-34-3002-6-py3: {extends: '.test_instance'} +# default-fedora-33-3002-6-py3: {extends: '.test_instance'} +# default-fedora-32-3002-6-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} +# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} -# default-debian-10-3001-6-py3: {extends: '.test_instance'} -# default-debian-9-3001-6-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} -# default-centos-8-3001-6-py3: {extends: '.test_instance'} -# default-centos-7-3001-6-py3: {extends: '.test_instance'} -# default-fedora-33-3001-6-py3: {extends: '.test_instance'} -# default-fedora-32-3001-6-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'} -# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'} +# default-debian-10-3001-7-py3: {extends: '.test_instance'} +# default-debian-9-3001-7-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} +# default-centos-8-3001-7-py3: {extends: '.test_instance'} +# default-centos-7-3001-7-py3: {extends: '.test_instance'} +# default-fedora-34-3001-7-py3: {extends: '.test_instance'} +# default-fedora-33-3001-7-py3: {extends: '.test_instance'} +# default-fedora-32-3001-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} +# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} -# default-debian-10-3000-8-py3: {extends: '.test_instance'} -# default-debian-9-3000-8-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} -# default-centos-8-3000-8-py3: {extends: '.test_instance'} -# default-centos-7-3000-8-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'} +# default-debian-10-3000-9-py3: {extends: '.test_instance'} +# default-debian-9-3000-9-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} +# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} +# default-centos-8-3000-9-py3: {extends: '.test_instance'} +# default-centos-7-3000-9-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} +# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} +# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} -# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} -# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index b505c9b..f5fec4b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,6 +63,9 @@ platforms: - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 + - name: fedora-34-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-34 - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 @@ -102,47 +105,101 @@ platforms: driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd - ## SALT `3002.5` - - name: debian-10-3002-5-py3 + ## SALT `3003.0` + - name: debian-10-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-10 - - name: debian-9-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-10 + - name: debian-9-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-9 - - name: ubuntu-2004-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-9 + - name: ubuntu-2004-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-18.04 + - name: centos-8-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-16.04 - - name: centos-8-3002-5-py3 + image: saltimages/salt-3003.0-py3:centos-8 + - name: centos-7-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:centos-8 - - name: centos-7-3002-5-py3 + image: saltimages/salt-3003.0-py3:centos-7 + - name: fedora-34-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:centos-7 - - name: fedora-33-3002-5-py3 + image: saltimages/salt-3003.0-py3:fedora-34 + - name: fedora-33-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:fedora-33 - - name: fedora-32-3002-5-py3 + image: saltimages/salt-3003.0-py3:fedora-33 + - name: fedora-32-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:fedora-32 - - name: amazonlinux-2-3002-5-py3 + image: saltimages/salt-3003.0-py3:fedora-32 + - name: amazonlinux-2-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:amazonlinux-2 - - name: oraclelinux-8-3002-5-py3 + image: saltimages/salt-3003.0-py3:amazonlinux-2 + - name: oraclelinux-8-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-8 - - name: oraclelinux-7-3002-5-py3 + image: saltimages/salt-3003.0-py3:oraclelinux-8 + - name: oraclelinux-7-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-7 - - name: arch-base-latest-3002-5-py3 + image: saltimages/salt-3003.0-py3:oraclelinux-7 + - name: arch-base-latest-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:arch-base-latest + image: saltimages/salt-3003.0-py3:arch-base-latest run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd + + ## SALT `3002.6` + - name: debian-10-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-10 + - name: debian-9-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-9 + - name: ubuntu-2004-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-16.04 + - name: centos-8-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:centos-8 + - name: centos-7-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:centos-7 + - name: fedora-34-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:fedora-34 + - name: fedora-33-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:fedora-33 + - name: fedora-32-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:fedora-32 + - name: amazonlinux-2-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:amazonlinux-2 + - name: oraclelinux-8-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:oraclelinux-8 + - name: oraclelinux-7-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:oraclelinux-7 + - name: arch-base-latest-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + + ## SALT `3002.5` - name: gentoo-stage3-latest-3002-5-py3 driver: image: saltimages/salt-3002.5-py3:gentoo-stage3-latest @@ -169,63 +226,68 @@ platforms: transport: max_ssh_sessions: 1 - ## SALT `3001.6` - - name: debian-10-3001-6-py3 + ## SALT `3001.7` + - name: debian-10-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-10 - - name: debian-9-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-10 + - name: debian-9-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-9 - - name: ubuntu-2004-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-9 + - name: ubuntu-2004-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-16.04 - - name: centos-8-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-16.04 + - name: centos-8-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:centos-8 - - name: centos-7-3001-6-py3 + image: saltimages/salt-3001.7-py3:centos-8 + - name: centos-7-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:centos-7 - - name: fedora-33-3001-6-py3 + image: saltimages/salt-3001.7-py3:centos-7 + - name: fedora-34-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:fedora-33 - - name: fedora-32-3001-6-py3 + image: saltimages/salt-3001.7-py3:fedora-34 + - name: fedora-33-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:fedora-32 - - name: opensuse-leap-152-3001-6-py3 + image: saltimages/salt-3001.7-py3:fedora-33 + - name: fedora-32-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:opensuse-leap-15.2 + image: saltimages/salt-3001.7-py3:fedora-32 + - name: opensuse-leap-152-3001-7-py3 + driver: + image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3001-6-py3 + - name: opensuse-tmbl-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3001-6-py3 + - name: amazonlinux-2-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:amazonlinux-2 - - name: oraclelinux-8-3001-6-py3 + image: saltimages/salt-3001.7-py3:amazonlinux-2 + - name: oraclelinux-8-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:oraclelinux-8 - - name: oraclelinux-7-3001-6-py3 + image: saltimages/salt-3001.7-py3:oraclelinux-8 + - name: oraclelinux-7-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:oraclelinux-7 - - name: arch-base-latest-3001-6-py3 + image: saltimages/salt-3001.7-py3:oraclelinux-7 + - name: arch-base-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:arch-base-latest + image: saltimages/salt-3001.7-py3:arch-base-latest run_command: /usr/lib/systemd/systemd + + ## SALT `3001.6` - name: gentoo-stage3-latest-3001-6-py3 driver: image: saltimages/salt-3001.6-py3:gentoo-stage3-latest @@ -234,42 +296,54 @@ platforms: driver: image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd - ## SALT `3000.8` - - name: debian-10-3000-8-py3 + ## SALT `3000.9` + - name: debian-10-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-10 - - name: debian-9-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-10 + - name: debian-9-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-9 - - name: ubuntu-1804-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-9 + - name: ubuntu-1804-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-16.04 - - name: centos-8-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-16.04 + - name: centos-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:centos-8 - - name: centos-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:centos-8 + - name: centos-7-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:centos-7 - - name: opensuse-leap-152-3000-8-py3 + image: saltimages/salt-3000.9-py3:centos-7 + - name: opensuse-leap-152-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:opensuse-leap-15.2 + image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3000-8-py3 + - name: amazonlinux-2-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:amazonlinux-2 - - name: oraclelinux-8-3000-8-py3 + image: saltimages/salt-3000.9-py3:amazonlinux-2 + - name: oraclelinux-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-8 - - name: oraclelinux-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:oraclelinux-8 + - name: oraclelinux-7-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-7 + image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: ubuntu-1804-3000-9-py2 + driver: + image: saltimages/salt-3000.9-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py2 + driver: + image: saltimages/salt-3000.9-py2:ubuntu-16.04 + - name: arch-base-latest-3000-9-py2 + driver: + image: saltimages/salt-3000.9-py2:arch-base-latest + run_command: /usr/lib/systemd/systemd + + ## SALT `3000.8` - name: gentoo-stage3-latest-3000-8-py3 driver: image: saltimages/salt-3000.8-py3:gentoo-stage3-latest @@ -277,16 +351,6 @@ platforms: - name: gentoo-stage3-systemd-3000-8-py3 driver: image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd - - name: ubuntu-1804-3000-8-py2 - driver: - image: saltimages/salt-3000.8-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py2 - driver: - image: saltimages/salt-3000.8-py2:ubuntu-16.04 - - name: arch-base-latest-3000-8-py2 - driver: - image: saltimages/salt-3000.8-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd provisioner: name: salt_solo @@ -340,27 +404,34 @@ suites: - centos-8-master-py3 - centos-7-master-py3 - oraclelinux-8-master-py3 - - debian-10-3002-5-py3 - - debian-9-3002-5-py3 - - ubuntu-2004-3002-5-py3 - - ubuntu-1804-3002-5-py3 - - centos-8-3002-5-py3 - - centos-7-3002-5-py3 - - oraclelinux-8-3002-5-py3 - - debian-10-3001-6-py3 - - debian-9-3001-6-py3 - - ubuntu-2004-3001-6-py3 - - ubuntu-1804-3001-6-py3 - - centos-8-3001-6-py3 - - centos-7-3001-6-py3 - - oraclelinux-8-3001-6-py3 - - debian-10-3000-8-py3 - - debian-9-3000-8-py3 - - ubuntu-1804-3000-8-py3 - - centos-8-3000-8-py3 - - centos-7-3000-8-py3 - - oraclelinux-8-3000-8-py3 - - ubuntu-1804-3000-8-py2 + - debian-10-3003-0-py3 + - debian-9-3003-0-py3 + - ubuntu-2004-3003-0-py3 + - ubuntu-1804-3003-0-py3 + - centos-8-3003-0-py3 + - centos-7-3003-0-py3 + - oraclelinux-8-3003-0-py3 + - debian-10-3002-6-py3 + - debian-9-3002-6-py3 + - ubuntu-2004-3002-6-py3 + - ubuntu-1804-3002-6-py3 + - centos-8-3002-6-py3 + - centos-7-3002-6-py3 + - oraclelinux-8-3002-6-py3 + - debian-10-3001-7-py3 + - debian-9-3001-7-py3 + - ubuntu-2004-3001-7-py3 + - ubuntu-1804-3001-7-py3 + - centos-8-3001-7-py3 + - centos-7-3001-7-py3 + - oraclelinux-8-3001-7-py3 + - debian-10-3000-9-py3 + - debian-9-3000-9-py3 + - ubuntu-1804-3000-9-py3 + - centos-8-3000-9-py3 + - centos-7-3000-9-py3 + - oraclelinux-8-3000-9-py3 + - ubuntu-1804-3000-9-py2 provisioner: state_top: base: From 622d22f9711085aeca19f3907e22e87c6b21b8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Fri, 12 Mar 2021 10:02:43 -0300 Subject: [PATCH 30/45] feat(servers_config): add require statement to manage dependencies Also, check config before applying --- nginx/config.sls | 3 --- nginx/servers_config.sls | 6 ++++++ nginx/service.sls | 3 +++ pillar.example | 12 ++++++++++++ test/salt/passenger/pillar/nginx.sls | 4 +--- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/nginx/config.sls b/nginx/config.sls index 82b181f..3cd00b5 100644 --- a/nginx/config.sls +++ b/nginx/config.sls @@ -31,6 +31,3 @@ nginx_config: - context: config: {{ nginx.server.config|json(sort_keys=False) }} {% endif %} -{% if nginx.check_config_before_apply %} - - check_cmd: /usr/sbin/nginx -t -c -{% endif %} diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 09aec68..5dd11a9 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -123,6 +123,12 @@ nginx_server_available_dir: }} - makedirs: True - template: jinja + {%- if 'requires' in settings %} + - require: + {%- for k, v in settings.requires.items() %} + - {{ k }}: {{ v }} + {%- endfor %} + {%- endif %} {% if 'source_path' not in settings.config %} - context: config: {{ settings.config|json(sort_keys=False) }} diff --git a/nginx/service.sls b/nginx/service.sls index 9cbc5cc..61defa3 100644 --- a/nginx/service.sls +++ b/nginx/service.sls @@ -42,3 +42,6 @@ nginx_service: {% else %} - pkg: nginx_install {% endif %} +{% if nginx.check_config_before_apply %} + - only_if: /usr/sbin/nginx -t +{% endif %} diff --git a/pillar.example b/pillar.example index ce6109b..7b610ef 100644 --- a/pillar.example +++ b/pillar.example @@ -202,6 +202,18 @@ nginx: # and None indicates no action enabled: true + # This let's you add dependencies on other resources being applied for a + # particular vhost + # A common case is when you use this formula together with letsencrypt's, + # validating through nginx: you need nginx running (to validate the vhost) but + # can't have the ssl vhost up until the certificate is created (because it + # won't exist and will make nginx fail to load the configuration) + # + # An example, when using LE to create the cert for 'some.host.domain': + # requires: + # cmd: create-initial-cert-some.host.domain + requires: {} + # Remove the site config file shipped by nginx # (i.e. '/etc/nginx/sites-available/default' by default) # It also remove the symlink (if it is exists). diff --git a/test/salt/passenger/pillar/nginx.sls b/test/salt/passenger/pillar/nginx.sls index 95edc52..63a9f54 100644 --- a/test/salt/passenger/pillar/nginx.sls +++ b/test/salt/passenger/pillar/nginx.sls @@ -26,7 +26,6 @@ nginx: - location ^~ /.well-known/acme-challenge/: - proxy_pass: http://localhost:9999 server: - config: # This is required to get the passenger module loaded # In Debian it can be done with this @@ -64,5 +63,4 @@ nginx: - index: 'index.html index.htm' - location ~ .htm: - try_files: '$uri $uri/ =404' - # - include: '/etc/nginx/snippets/letsencrypt.conf' - - include: 'snippets/letsencrypt.conf' + - include: '/etc/nginx/snippets/letsencrypt.conf' From 64781431b9187d392f56ce5461c3b1a9c2944f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 28 Apr 2021 10:56:22 -0300 Subject: [PATCH 31/45] test(requires): verify dependencies in vhosts --- kitchen.yml | 4 ++++ test/integration/default/controls/config.rb | 11 +++++++++++ test/integration/default/controls/file.rb | 9 +++++++++ test/salt/default/pillar/nginx.sls | 13 +++++++++++++ .../states/test_dep/create_dependency_file.sls | 6 ++++++ 5 files changed, 43 insertions(+) create mode 100644 test/integration/default/controls/file.rb create mode 100644 test/salt/default/states/test_dep/create_dependency_file.sls diff --git a/kitchen.yml b/kitchen.yml index b505c9b..db344af 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -309,9 +309,13 @@ verifier: suites: - name: default provisioner: + dependencies: + - name: test_dep + path: test/salt/default/states state_top: base: '*': + - test_dep.create_dependency_file - nginx._mapdata - nginx pillars: diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 6d7c999..c2845eb 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -71,5 +71,16 @@ control 'Nginx configuration' do its('content') { should include 'try_files $uri $uri/ =404;' } its('content') { should include 'include snippets/letsencrypt.conf;' } end + describe file "#{dir}/mysite_with_require" do + it { should be_file } + it { should be_owned_by file_owner } + it { should be_grouped_into file_group } + its('mode') { should cmp '0644' } + its('content') { should include 'server_name with-deps;' } + its('content') { should include 'listen 80;' } + its('content') { should include 'index index.html index.htm;' } + its('content') { should include 'location ~ .htm {' } + its('content') { should include 'try_files $uri $uri/ =404;' } + end end end diff --git a/test/integration/default/controls/file.rb b/test/integration/default/controls/file.rb new file mode 100644 index 0000000..57151af --- /dev/null +++ b/test/integration/default/controls/file.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +control 'Dependency test file' do + title 'should exist' + + describe file('/tmp/created_to_test_dependencies') do + it { should be_file } + end +end diff --git a/test/salt/default/pillar/nginx.sls b/test/salt/default/pillar/nginx.sls index ef6ccfa..84afe98 100644 --- a/test/salt/default/pillar/nginx.sls +++ b/test/salt/default/pillar/nginx.sls @@ -37,6 +37,19 @@ nginx: - location ~ .htm: - try_files: '$uri $uri/ =404' - include: 'snippets/letsencrypt.conf' + mysite_with_require: + enabled: true + config: + - server: + - server_name: with-deps + - listen: + - '80' + - index: 'index.html index.htm' + - location ~ .htm: + - try_files: '$uri $uri/ =404' + requires: + file: created_to_test_dependencies + dh_param: 'mydhparam2.pem': keysize: 2048 diff --git a/test/salt/default/states/test_dep/create_dependency_file.sls b/test/salt/default/states/test_dep/create_dependency_file.sls new file mode 100644 index 0000000..e242927 --- /dev/null +++ b/test/salt/default/states/test_dep/create_dependency_file.sls @@ -0,0 +1,6 @@ +## this state creates a file that is used to test vhosts dependencies +# (see https://github.com/saltstack-formulas/nginx-formula/pull/278) + +created_to_test_dependencies: + file.managed: + - name: /tmp/created_to_test_dependencies From 49fb7eae7abe3fde80d6331ed5af6ba166a2297f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 28 Apr 2021 14:53:21 +0000 Subject: [PATCH 32/45] chore(release): 2.7.0 [skip ci] # [2.7.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.3...v2.7.0) (2021-04-28) ### Continuous Integration * **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([46faf4e](https://github.com/saltstack-formulas/nginx-formula/commit/46faf4e24b39f7d4fd138126dbe5eb6a06eb5b67)) * **vagrant:** add FreeBSD 13.0 [skip ci] ([b41062e](https://github.com/saltstack-formulas/nginx-formula/commit/b41062e3b19c4c109198bd95c53158d871bbff85)) * **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([b9e9cd3](https://github.com/saltstack-formulas/nginx-formula/commit/b9e9cd38e6d29b7eb4cd8ae74a1bdf901959dee3)) ### Documentation * **readme:** add `Testing with Vagrant` section [skip ci] ([5727848](https://github.com/saltstack-formulas/nginx-formula/commit/57278481de489441a5c04aee544962212e91c5af)) ### Features * **servers_config:** add require statement to manage dependencies ([622d22f](https://github.com/saltstack-formulas/nginx-formula/commit/622d22f9711085aeca19f3907e22e87c6b21b8d0)) ### Tests * **requires:** verify dependencies in vhosts ([6478143](https://github.com/saltstack-formulas/nginx-formula/commit/64781431b9187d392f56ce5461c3b1a9c2944f90)) --- AUTHORS.md | 8 ++++---- CHANGELOG.md | 24 ++++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 16 ++++++++-------- docs/CHANGELOG.rst | 29 +++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 13 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 8e933e7..b96cbf2 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,13 +4,13 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|96 +@myii|[@myii](https://github.com/myii)|101 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|17 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|14 @ross-p|[@ross-p](https://github.com/ross-p)|13 @daks|[@daks](https://github.com/daks)|11 @techhat|[@techhat](https://github.com/techhat)|10 @@ -47,7 +47,6 @@ Avatar|Contributor|Contributions @kmshultz|[@kmshultz](https://github.com/kmshultz)|2 @malept|[@malept](https://github.com/malept)|2 @meganlkm|[@meganlkm](https://github.com/meganlkm)|2 -@garrettw|[@garrettw](https://github.com/garrettw)|2 @ErisDS|[@ErisDS](https://github.com/ErisDS)|2 @myoung34|[@myoung34](https://github.com/myoung34)|2 @sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @@ -64,6 +63,7 @@ Avatar|Contributor|Contributions @czarneckid|[@czarneckid](https://github.com/czarneckid)|1 @statik|[@statik](https://github.com/statik)|1 @ekristen|[@ekristen](https://github.com/ekristen)|1 +@garrettw|[@garrettw](https://github.com/garrettw)|1 @jeduardo|[@jeduardo](https://github.com/jeduardo)|1 @stromnet|[@stromnet](https://github.com/stromnet)|1 @bsdlp|[@bsdlp](https://github.com/bsdlp)|1 @@ -81,4 +81,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-03. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-28. diff --git a/CHANGELOG.md b/CHANGELOG.md index f8455f5..6405014 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +# [2.7.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.3...v2.7.0) (2021-04-28) + + +### Continuous Integration + +* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([46faf4e](https://github.com/saltstack-formulas/nginx-formula/commit/46faf4e24b39f7d4fd138126dbe5eb6a06eb5b67)) +* **vagrant:** add FreeBSD 13.0 [skip ci] ([b41062e](https://github.com/saltstack-formulas/nginx-formula/commit/b41062e3b19c4c109198bd95c53158d871bbff85)) +* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([b9e9cd3](https://github.com/saltstack-formulas/nginx-formula/commit/b9e9cd38e6d29b7eb4cd8ae74a1bdf901959dee3)) + + +### Documentation + +* **readme:** add `Testing with Vagrant` section [skip ci] ([5727848](https://github.com/saltstack-formulas/nginx-formula/commit/57278481de489441a5c04aee544962212e91c5af)) + + +### Features + +* **servers_config:** add require statement to manage dependencies ([622d22f](https://github.com/saltstack-formulas/nginx-formula/commit/622d22f9711085aeca19f3907e22e87c6b21b8d0)) + + +### Tests + +* **requires:** verify dependencies in vhosts ([6478143](https://github.com/saltstack-formulas/nginx-formula/commit/64781431b9187d392f56ce5461c3b1a9c2944f90)) + ## [2.6.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.2...v2.6.3) (2021-04-03) diff --git a/FORMULA b/FORMULA index a7779b5..c1001d9 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.6.3 +version: 2.7.0 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 8d9701d..8ffa747 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 96 + - 101 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -28,12 +28,12 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 + * - :raw-html-m2r:`@javierbertoli` + - `@javierbertoli `_ + - 17 * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 17 - * - :raw-html-m2r:`@javierbertoli` - - `@javierbertoli `_ - - 14 * - :raw-html-m2r:`@ross-p` - `@ross-p `_ - 13 @@ -142,9 +142,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@meganlkm` - `@meganlkm `_ - 2 - * - :raw-html-m2r:`@garrettw` - - `@garrettw `_ - - 2 * - :raw-html-m2r:`@ErisDS` - `@ErisDS `_ - 2 @@ -193,6 +190,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@ekristen` - `@ekristen `_ - 1 + * - :raw-html-m2r:`@garrettw` + - `@garrettw `_ + - 1 * - :raw-html-m2r:`@jeduardo` - `@jeduardo `_ - 1 @@ -239,4 +239,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-04-03. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-04-28. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 7158a54..a64f2de 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,35 @@ Changelog ========= +`2.7.0 `_ (2021-04-28) +------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `46faf4e `_\ ) +* **vagrant:** add FreeBSD 13.0 [skip ci] (\ `b41062e `_\ ) +* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] (\ `b9e9cd3 `_\ ) + +Documentation +^^^^^^^^^^^^^ + + +* **readme:** add ``Testing with Vagrant`` section [skip ci] (\ `5727848 `_\ ) + +Features +^^^^^^^^ + + +* **servers_config:** add require statement to manage dependencies (\ `622d22f `_\ ) + +Tests +^^^^^ + + +* **requires:** verify dependencies in vhosts (\ `6478143 `_\ ) + `2.6.3 `_ (2021-04-03) ------------------------------------------------------------------------------------------------------- From 46971528d7a7e23241564da146ee8d28b7d2eecc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 9 May 2021 22:31:44 +0100 Subject: [PATCH 33/45] ci: add `arch-master` to matrix and update `.travis.yml` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/323 --- .gitlab-ci.yml | 5 ++- .travis.yml | 104 +++++++++++++++++++++++++++++-------------------- kitchen.yml | 4 ++ 3 files changed, 69 insertions(+), 44 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a19274b..f014be5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,6 +170,8 @@ default-amazonlinux-2-master-py3: {extends: '.test_instance'} oraclelinux-8-master-py3: {extends: '.test_instance'} default-oraclelinux-7-master-py3: {extends: '.test_instance'} # oraclelinux-7-master-py3: {extends: '.test_instance'} +default-arch-base-latest-master-py3: {extends: '.test_instance'} +# arch-base-latest-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} # gentoo-stage3-latest-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} @@ -186,8 +188,7 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} -default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} -# arch-base-latest-3003-0-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} # default-debian-10-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index eae765c..f31e934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,6 +113,8 @@ jobs: # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=passenger-centos-7-master-py3 - env: INSTANCE=centos-7-master-py3 + - env: INSTANCE=default-fedora-34-master-py3 + # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 # - env: INSTANCE=fedora-33-master-py3 - env: INSTANCE=default-fedora-32-master-py3 @@ -128,60 +130,78 @@ jobs: - env: INSTANCE=oraclelinux-8-master-py3 - env: INSTANCE=default-oraclelinux-7-master-py3 # - env: INSTANCE=oraclelinux-7-master-py3 + - env: INSTANCE=default-arch-base-latest-master-py3 + # - env: INSTANCE=arch-base-latest-master-py3 # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 # - env: INSTANCE=gentoo-stage3-latest-master-py3 - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=gentoo-stage3-systemd-master-py3 - # - env: INSTANCE=default-debian-10-3002-5-py3 - # - env: INSTANCE=default-debian-9-3002-5-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-5-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-5-py3 - # - env: INSTANCE=default-ubuntu-1604-3002-5-py3 - # - env: INSTANCE=default-centos-8-3002-5-py3 - # - env: INSTANCE=default-centos-7-3002-5-py3 - # - env: INSTANCE=default-fedora-33-3002-5-py3 - # - env: INSTANCE=default-fedora-32-3002-5-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-5-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-5-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-5-py3 - - env: INSTANCE=default-arch-base-latest-3002-5-py3 - # - env: INSTANCE=arch-base-latest-3002-5-py3 + # - env: INSTANCE=default-debian-10-3003-0-py3 + # - env: INSTANCE=default-debian-9-3003-0-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-0-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-0-py3 + # - env: INSTANCE=default-centos-8-3003-0-py3 + # - env: INSTANCE=default-centos-7-3003-0-py3 + # - env: INSTANCE=default-fedora-34-3003-0-py3 + # - env: INSTANCE=default-fedora-33-3003-0-py3 + # - env: INSTANCE=default-fedora-32-3003-0-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 + # - env: INSTANCE=default-arch-base-latest-3003-0-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3 + # - env: INSTANCE=default-debian-10-3002-6-py3 + # - env: INSTANCE=default-debian-9-3002-6-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 + # - env: INSTANCE=default-ubuntu-1604-3002-6-py3 + # - env: INSTANCE=default-centos-8-3002-6-py3 + # - env: INSTANCE=default-centos-7-3002-6-py3 + # - env: INSTANCE=default-fedora-34-3002-6-py3 + # - env: INSTANCE=default-fedora-33-3002-6-py3 + # - env: INSTANCE=default-fedora-32-3002-6-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 + # - env: INSTANCE=default-arch-base-latest-3002-6-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 - # - env: INSTANCE=default-debian-10-3001-6-py3 - # - env: INSTANCE=default-debian-9-3001-6-py3 - # - env: INSTANCE=default-ubuntu-2004-3001-6-py3 - # - env: INSTANCE=default-ubuntu-1804-3001-6-py3 - # - env: INSTANCE=default-ubuntu-1604-3001-6-py3 - # - env: INSTANCE=default-centos-8-3001-6-py3 - # - env: INSTANCE=default-centos-7-3001-6-py3 - # - env: INSTANCE=default-fedora-33-3001-6-py3 - # - env: INSTANCE=default-fedora-32-3001-6-py3 - # - env: INSTANCE=default-opensuse-leap-152-3001-6-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3001-6-py3 - # - env: INSTANCE=default-amazonlinux-2-3001-6-py3 - # - env: INSTANCE=default-oraclelinux-8-3001-6-py3 - # - env: INSTANCE=default-oraclelinux-7-3001-6-py3 - # - env: INSTANCE=default-arch-base-latest-3001-6-py3 + # - env: INSTANCE=default-debian-10-3001-7-py3 + # - env: INSTANCE=default-debian-9-3001-7-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 + # - env: INSTANCE=default-ubuntu-1604-3001-7-py3 + # - env: INSTANCE=default-centos-8-3001-7-py3 + # - env: INSTANCE=default-centos-7-3001-7-py3 + # - env: INSTANCE=default-fedora-34-3001-7-py3 + # - env: INSTANCE=default-fedora-33-3001-7-py3 + # - env: INSTANCE=default-fedora-32-3001-7-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-7-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-7-py3 + # - env: INSTANCE=default-arch-base-latest-3001-7-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3 - # - env: INSTANCE=default-debian-10-3000-8-py3 - # - env: INSTANCE=default-debian-9-3000-8-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-8-py3 - # - env: INSTANCE=default-ubuntu-1604-3000-8-py3 - # - env: INSTANCE=default-centos-8-3000-8-py3 - # - env: INSTANCE=default-centos-7-3000-8-py3 - # - env: INSTANCE=default-opensuse-leap-152-3000-8-py3 - # - env: INSTANCE=default-amazonlinux-2-3000-8-py3 - # - env: INSTANCE=default-oraclelinux-8-3000-8-py3 - # - env: INSTANCE=default-oraclelinux-7-3000-8-py3 + # - env: INSTANCE=default-debian-10-3000-9-py3 + # - env: INSTANCE=default-debian-9-3000-9-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 + # - env: INSTANCE=default-ubuntu-1604-3000-9-py3 + # - env: INSTANCE=default-centos-8-3000-9-py3 + # - env: INSTANCE=default-centos-7-3000-9-py3 + # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 + # - env: INSTANCE=default-amazonlinux-2-3000-9-py3 + # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 + # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-9-py2 + # - env: INSTANCE=default-arch-base-latest-3000-9-py2 # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-8-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-8-py2 - # - env: INSTANCE=default-arch-base-latest-3000-8-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 2756a47..a6fef66 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -97,6 +97,10 @@ platforms: - name: oraclelinux-7-master-py3 driver: image: saltimages/salt-master-py3:oraclelinux-7 + - name: arch-base-latest-master-py3 + driver: + image: saltimages/salt-master-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd - name: gentoo-stage3-latest-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-latest From 494b2fbea490fded02cecd4d3e3e0372476548fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 12 May 2021 12:09:29 -0300 Subject: [PATCH 34/45] fix(servers): wrong conditional specification --- nginx/service.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/service.sls b/nginx/service.sls index 61defa3..adb51f0 100644 --- a/nginx/service.sls +++ b/nginx/service.sls @@ -43,5 +43,5 @@ nginx_service: - pkg: nginx_install {% endif %} {% if nginx.check_config_before_apply %} - - only_if: /usr/sbin/nginx -t + - onlyif: /usr/sbin/nginx -t {% endif %} From 30a33700d78752c8a5fcc1f232169f761e9b3dff Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 12 May 2021 16:40:49 +0000 Subject: [PATCH 35/45] chore(release): 2.7.1 [skip ci] ## [2.7.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.0...v2.7.1) (2021-05-12) ### Bug Fixes * **servers:** wrong conditional specification ([494b2fb](https://github.com/saltstack-formulas/nginx-formula/commit/494b2fbea490fded02cecd4d3e3e0372476548fb)) ### Continuous Integration * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([4697152](https://github.com/saltstack-formulas/nginx-formula/commit/46971528d7a7e23241564da146ee8d28b7d2eecc)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 12 ++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 10 +++++----- docs/CHANGELOG.rst | 15 +++++++++++++++ 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index b96cbf2..2f466eb 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|101 +@myii|[@myii](https://github.com/myii)|103 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|18 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|17 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 @ross-p|[@ross-p](https://github.com/ross-p)|13 @daks|[@daks](https://github.com/daks)|11 @@ -81,4 +81,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-28. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-05-12. diff --git a/CHANGELOG.md b/CHANGELOG.md index 6405014..dcedd76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.7.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.0...v2.7.1) (2021-05-12) + + +### Bug Fixes + +* **servers:** wrong conditional specification ([494b2fb](https://github.com/saltstack-formulas/nginx-formula/commit/494b2fbea490fded02cecd4d3e3e0372476548fb)) + + +### Continuous Integration + +* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([4697152](https://github.com/saltstack-formulas/nginx-formula/commit/46971528d7a7e23241564da146ee8d28b7d2eecc)) + # [2.7.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.6.3...v2.7.0) (2021-04-28) diff --git a/FORMULA b/FORMULA index c1001d9..8456a9b 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.7.0 +version: 2.7.1 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 8ffa747..a06ee28 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 101 + - 103 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -25,12 +25,12 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 24 + * - :raw-html-m2r:`@javierbertoli` + - `@javierbertoli `_ + - 18 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 - * - :raw-html-m2r:`@javierbertoli` - - `@javierbertoli `_ - - 17 * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 17 @@ -239,4 +239,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-04-28. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-05-12. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index a64f2de..5108799 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`2.7.1 `_ (2021-05-12) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **servers:** wrong conditional specification (\ `494b2fb `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `4697152 `_\ ) + `2.7.0 `_ (2021-04-28) ------------------------------------------------------------------------------------------------------- From a55f741901de6b33866394eb0cc1a7e40bc2b3f2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 20 May 2021 14:08:42 +0100 Subject: [PATCH 36/45] chore(pre-commit): use `info` report level for `rstcheck` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/325 --- .pre-commit-config.yaml | 1 - .rstcheck.cfg | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea8271b..9bc4109 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,4 +52,3 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' - args: [--report=warning] diff --git a/.rstcheck.cfg b/.rstcheck.cfg index 05856dc..5383623 100644 --- a/.rstcheck.cfg +++ b/.rstcheck.cfg @@ -1,3 +1,4 @@ [rstcheck] -report=error +report=info ignore_language=rst +ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$) From 6cb486dbd290c91bbdbf00fd0061efaedbef4dea Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Sat, 23 Jan 2021 07:04:12 -0700 Subject: [PATCH 37/45] fix(snippets): ignore servers or snippets when undefined nginx.servers_config wants a lightened copy of the nginx map to render as json; but, when it was trying to remove the servers and snippets keys from the map it assumed their presence, causing a KeyError if they were not present by its use of .pop(). While wrapping these in an "if" clause would likely be more correct, along with replacing .pop() with del (if jinja even supports that) the simplest change here is to just specify a default value for .pop(), which obviates the KeyError. Fixes #274 --- nginx/servers_config.sls | 4 ++-- nginx/snippets.sls | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 5dd11a9..6652d64 100644 --- a/nginx/servers_config.sls +++ b/nginx/servers_config.sls @@ -10,8 +10,8 @@ {% set server_states = [] %} {#- _nginx is a lightened copy of nginx map intended to passed in templates #} {%- set _nginx = nginx.copy() %} -{%- do _nginx.pop('snippets') %} -{%- do _nginx.pop('servers') %} +{%- do _nginx.pop('snippets') if nginx.snippets is defined %} +{%- do _nginx.pop('servers') if nginx.servers is defined %} # Simple path concatenation. # Needs work to make this function on windows. diff --git a/nginx/snippets.sls b/nginx/snippets.sls index d09ba36..f19905b 100644 --- a/nginx/snippets.sls +++ b/nginx/snippets.sls @@ -8,8 +8,8 @@ {#- _nginx is a lightened copy of nginx map intended to passed in templates #} {%- set _nginx = nginx.copy() %} -{%- do _nginx.pop('snippets') %} -{%- do _nginx.pop('servers') %} +{%- do _nginx.pop('snippets') if nginx.snippets is defined %} +{%- do _nginx.pop('servers') if nginx.servers is defined %} nginx_snippets_dir: file.directory: From 0cd7c7b20528ce9fbd4f8991a365415a3093546d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Jun 2021 18:31:06 +0100 Subject: [PATCH 38/45] fix(certificates): ensure `openssl` installed before `cmd.run` Fix failure highlighted on OpenSUSE Tumbleweed, where the `cmd.run` runs before the `pkg.installed`: * https://gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830 --- nginx/certificates.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx/certificates.sls b/nginx/certificates.sls index 2a8330b..8781045 100644 --- a/nginx/certificates.sls +++ b/nginx/certificates.sls @@ -30,6 +30,7 @@ generate_nginx_dhparam_{{ dh_param }}_key: - creates: {{ certificates_path }}/{{ dh_param }} - require: - file: prepare_certificates_path_dir + - pkg: generate_nginx_dhparam_{{ dh_param }}_key - watch_in: - service: nginx_service {%- endif %} From 1c83b6d5fa93079476ca9e8baa1ccd9d44e5237f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Tue, 13 Apr 2021 17:42:48 -0300 Subject: [PATCH 39/45] test(snippets): add tests for snippets includes based on #275 fixes #274 --- test/salt/passenger/pillar/nginx.sls | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/salt/passenger/pillar/nginx.sls b/test/salt/passenger/pillar/nginx.sls index 63a9f54..c8d90d4 100644 --- a/test/salt/passenger/pillar/nginx.sls +++ b/test/salt/passenger/pillar/nginx.sls @@ -2,7 +2,6 @@ # vim: ft=yaml --- # Simple pillar setup -# - snippet letsencrypt # - remove 'default' site # - create 'mysite' site @@ -21,10 +20,6 @@ nginx: lookup: passenger_package: {{ passenger_pkg }} - snippets: - letsencrypt.conf: - - location ^~ /.well-known/acme-challenge/: - - proxy_pass: http://localhost:9999 server: config: # This is required to get the passenger module loaded @@ -63,4 +58,3 @@ nginx: - index: 'index.html index.htm' - location ~ .htm: - try_files: '$uri $uri/ =404' - - include: '/etc/nginx/snippets/letsencrypt.conf' From b19fdded1bfeb8b5d820277f51ea713f5169c078 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 14 Jun 2021 18:00:54 +0000 Subject: [PATCH 40/45] chore(release): 2.7.2 [skip ci] ## [2.7.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.1...v2.7.2) (2021-06-14) ### Bug Fixes * **certificates:** ensure `openssl` installed before `cmd.run` ([0cd7c7b](https://github.com/saltstack-formulas/nginx-formula/commit/0cd7c7b20528ce9fbd4f8991a365415a3093546d)), closes [/gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830](https://github.com//gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819/issues/L2830) * **snippets:** ignore servers or snippets when undefined ([6cb486d](https://github.com/saltstack-formulas/nginx-formula/commit/6cb486dbd290c91bbdbf00fd0061efaedbef4dea)), closes [#274](https://github.com/saltstack-formulas/nginx-formula/issues/274) --- AUTHORS.md | 7 ++++--- CHANGELOG.md | 8 ++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 9 ++++++--- docs/CHANGELOG.rst | 10 ++++++++++ 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 2f466eb..856c9ff 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,11 +4,11 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|103 +@myii|[@myii](https://github.com/myii)|105 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|18 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|19 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 @ross-p|[@ross-p](https://github.com/ross-p)|13 @@ -67,6 +67,7 @@ Avatar|Contributor|Contributions @jeduardo|[@jeduardo](https://github.com/jeduardo)|1 @stromnet|[@stromnet](https://github.com/stromnet)|1 @bsdlp|[@bsdlp](https://github.com/bsdlp)|1 +@anderbubble|[@anderbubble](https://github.com/anderbubble)|1 @MEschenbacher|[@MEschenbacher](https://github.com/MEschenbacher)|1 @renich|[@renich](https://github.com/renich)|1 @outime|[@outime](https://github.com/outime)|1 @@ -81,4 +82,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-05-12. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-14. diff --git a/CHANGELOG.md b/CHANGELOG.md index dcedd76..14bd24d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.7.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.1...v2.7.2) (2021-06-14) + + +### Bug Fixes + +* **certificates:** ensure `openssl` installed before `cmd.run` ([0cd7c7b](https://github.com/saltstack-formulas/nginx-formula/commit/0cd7c7b20528ce9fbd4f8991a365415a3093546d)), closes [/gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830](https://github.com//gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819/issues/L2830) +* **snippets:** ignore servers or snippets when undefined ([6cb486d](https://github.com/saltstack-formulas/nginx-formula/commit/6cb486dbd290c91bbdbf00fd0061efaedbef4dea)), closes [#274](https://github.com/saltstack-formulas/nginx-formula/issues/274) + ## [2.7.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.0...v2.7.1) (2021-05-12) diff --git a/FORMULA b/FORMULA index 8456a9b..5753d26 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.7.1 +version: 2.7.2 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index a06ee28..677394b 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 103 + - 105 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -27,7 +27,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 24 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 18 + - 19 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 @@ -202,6 +202,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@bsdlp` - `@bsdlp `_ - 1 + * - :raw-html-m2r:`@anderbubble` + - `@anderbubble `_ + - 1 * - :raw-html-m2r:`@MEschenbacher` - `@MEschenbacher `_ - 1 @@ -239,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-05-12. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-14. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 5108799..5852007 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog ========= +`2.7.2 `_ (2021-06-14) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **certificates:** ensure ``openssl`` installed before ``cmd.run`` (\ `0cd7c7b `_\ ), closes `/gitlab.com/saltstack-formulas/nginx-formula/-/jobs/1345325819#L2830 `_ +* **snippets:** ignore servers or snippets when undefined (\ `6cb486d `_\ ), closes `#274 `_ + `2.7.1 `_ (2021-05-12) ------------------------------------------------------------------------------------------------------- From b0c556ce1ac7ba33a412a5ed25f7d0afa062bbc5 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 14 Jun 2021 18:42:25 +0000 Subject: [PATCH 41/45] chore(release): 2.7.3 [skip ci] ## [2.7.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.2...v2.7.3) (2021-06-14) ### Tests * **snippets:** add tests for snippets includes ([1c83b6d](https://github.com/saltstack-formulas/nginx-formula/commit/1c83b6d5fa93079476ca9e8baa1ccd9d44e5237f)), closes [#275](https://github.com/saltstack-formulas/nginx-formula/issues/275) [#274](https://github.com/saltstack-formulas/nginx-formula/issues/274) --- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/CHANGELOG.rst | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14bd24d..0e067d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.7.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.2...v2.7.3) (2021-06-14) + + +### Tests + +* **snippets:** add tests for snippets includes ([1c83b6d](https://github.com/saltstack-formulas/nginx-formula/commit/1c83b6d5fa93079476ca9e8baa1ccd9d44e5237f)), closes [#275](https://github.com/saltstack-formulas/nginx-formula/issues/275) [#274](https://github.com/saltstack-formulas/nginx-formula/issues/274) + ## [2.7.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.1...v2.7.2) (2021-06-14) diff --git a/FORMULA b/FORMULA index 5753d26..f14d864 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.7.2 +version: 2.7.3 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 5852007..59d44e3 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`2.7.3 `_ (2021-06-14) +------------------------------------------------------------------------------------------------------- + +Tests +^^^^^ + + +* **snippets:** add tests for snippets includes (\ `1c83b6d `_\ ), closes `#275 `_ `#274 `_ + `2.7.2 `_ (2021-06-14) ------------------------------------------------------------------------------------------------------- From 00387e7cbd90ceb5496df5cf9bce8f7dae25b056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Thu, 15 Apr 2021 15:10:45 -0300 Subject: [PATCH 42/45] fix(servers): include main config file watch in extend --- nginx/servers.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx/servers.sls b/nginx/servers.sls index 8108b15..4f26fd4 100644 --- a/nginx/servers.sls +++ b/nginx/servers.sls @@ -22,7 +22,9 @@ extend: service: - reload: True - require: + - file: nginx_config {{ file_requisites(server_states) }} - listen: + - file: nginx_config {{ file_requisites(server_states) }} {% endif %} From faf54bd08e5a5bf26f4f8fec9f1785a0c6bef55b Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 15 Jun 2021 18:22:04 +0000 Subject: [PATCH 43/45] chore(release): 2.7.4 [skip ci] ## [2.7.4](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.3...v2.7.4) (2021-06-15) ### Bug Fixes * **servers:** include main config file watch in extend ([00387e7](https://github.com/saltstack-formulas/nginx-formula/commit/00387e7cbd90ceb5496df5cf9bce8f7dae25b056)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 6 +++--- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 856c9ff..b9e6fb2 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,11 +4,11 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|105 +@myii|[@myii](https://github.com/myii)|107 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|19 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|21 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 @ross-p|[@ross-p](https://github.com/ross-p)|13 @@ -82,4 +82,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-14. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-15. diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e067d5..8d9a66a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.7.4](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.3...v2.7.4) (2021-06-15) + + +### Bug Fixes + +* **servers:** include main config file watch in extend ([00387e7](https://github.com/saltstack-formulas/nginx-formula/commit/00387e7cbd90ceb5496df5cf9bce8f7dae25b056)) + ## [2.7.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.2...v2.7.3) (2021-06-14) diff --git a/FORMULA b/FORMULA index f14d864..636b36f 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.7.3 +version: 2.7.4 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 677394b..a8e625c 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 105 + - 107 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -27,7 +27,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 24 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 19 + - 21 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 @@ -242,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-14. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-15. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 59d44e3..f25d2de 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`2.7.4 `_ (2021-06-15) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **servers:** include main config file watch in extend (\ `00387e7 `_\ ) + `2.7.3 `_ (2021-06-14) ------------------------------------------------------------------------------------------------------- From d15f3decb3fb1d8d1d04934c8d909913380d53f1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:46:09 +0100 Subject: [PATCH 44/45] ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/331 --- .gitlab-ci.yml | 12 ------------ .travis.yml | 12 ------------ kitchen.yml | 30 ------------------------------ 3 files changed, 54 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f014be5..14ac9eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ rubocop: # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} # default-centos-8-tiamat-py3: {extends: '.test_instance'} # default-centos-7-tiamat-py3: {extends: '.test_instance'} # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -145,8 +144,6 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-master-py3: {extends: '.test_instance'} # passenger-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -default-ubuntu-1604-master-py3: {extends: '.test_instance'} -# ubuntu-1604-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} # passenger-centos-8-master-py3: {extends: '.test_instance'} centos-8-master-py3: {extends: '.test_instance'} @@ -157,8 +154,6 @@ default-fedora-34-master-py3: {extends: '.test_instance'} # fedora-34-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} # fedora-33-master-py3: {extends: '.test_instance'} -default-fedora-32-master-py3: {extends: '.test_instance'} -# fedora-32-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # opensuse-leap-152-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} @@ -184,7 +179,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-centos-7-3003-0-py3: {extends: '.test_instance'} # default-fedora-34-3003-0-py3: {extends: '.test_instance'} # default-fedora-33-3003-0-py3: {extends: '.test_instance'} -# default-fedora-32-3003-0-py3: {extends: '.test_instance'} # default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} @@ -195,12 +189,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} # default-centos-8-3002-6-py3: {extends: '.test_instance'} # default-centos-7-3002-6-py3: {extends: '.test_instance'} # default-fedora-34-3002-6-py3: {extends: '.test_instance'} # default-fedora-33-3002-6-py3: {extends: '.test_instance'} -# default-fedora-32-3002-6-py3: {extends: '.test_instance'} # default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} @@ -213,12 +205,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-9-3001-7-py3: {extends: '.test_instance'} # default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} # default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} # default-centos-8-3001-7-py3: {extends: '.test_instance'} # default-centos-7-3001-7-py3: {extends: '.test_instance'} # default-fedora-34-3001-7-py3: {extends: '.test_instance'} # default-fedora-33-3001-7-py3: {extends: '.test_instance'} -# default-fedora-32-3001-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} @@ -230,7 +220,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-10-3000-9-py3: {extends: '.test_instance'} # default-debian-9-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} # default-centos-8-3000-9-py3: {extends: '.test_instance'} # default-centos-7-3000-9-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} @@ -238,7 +227,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} # default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index f31e934..74b0bf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,6 @@ jobs: # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=default-ubuntu-1604-tiamat-py3 # - env: INSTANCE=default-centos-8-tiamat-py3 # - env: INSTANCE=default-centos-7-tiamat-py3 # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 @@ -105,8 +104,6 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=passenger-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - - env: INSTANCE=default-ubuntu-1604-master-py3 - # - env: INSTANCE=ubuntu-1604-master-py3 # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=passenger-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 @@ -117,8 +114,6 @@ jobs: # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 # - env: INSTANCE=fedora-33-master-py3 - - env: INSTANCE=default-fedora-32-master-py3 - # - env: INSTANCE=fedora-32-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=opensuse-leap-152-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 @@ -144,7 +139,6 @@ jobs: # - env: INSTANCE=default-centos-7-3003-0-py3 # - env: INSTANCE=default-fedora-34-3003-0-py3 # - env: INSTANCE=default-fedora-33-3003-0-py3 - # - env: INSTANCE=default-fedora-32-3003-0-py3 # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 @@ -155,12 +149,10 @@ jobs: # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=default-ubuntu-1604-3002-6-py3 # - env: INSTANCE=default-centos-8-3002-6-py3 # - env: INSTANCE=default-centos-7-3002-6-py3 # - env: INSTANCE=default-fedora-34-3002-6-py3 # - env: INSTANCE=default-fedora-33-3002-6-py3 - # - env: INSTANCE=default-fedora-32-3002-6-py3 # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 @@ -173,12 +165,10 @@ jobs: # - env: INSTANCE=default-debian-9-3001-7-py3 # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=default-ubuntu-1604-3001-7-py3 # - env: INSTANCE=default-centos-8-3001-7-py3 # - env: INSTANCE=default-centos-7-3001-7-py3 # - env: INSTANCE=default-fedora-34-3001-7-py3 # - env: INSTANCE=default-fedora-33-3001-7-py3 - # - env: INSTANCE=default-fedora-32-3001-7-py3 # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 @@ -190,7 +180,6 @@ jobs: # - env: INSTANCE=default-debian-10-3000-9-py3 # - env: INSTANCE=default-debian-9-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1604-3000-9-py3 # - env: INSTANCE=default-centos-8-3000-9-py3 # - env: INSTANCE=default-centos-7-3000-9-py3 # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 @@ -198,7 +187,6 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-9-py2 # - env: INSTANCE=default-arch-base-latest-3000-9-py2 # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 diff --git a/kitchen.yml b/kitchen.yml index a6fef66..176324f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -22,9 +22,6 @@ platforms: - name: ubuntu-1804-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 - - name: ubuntu-1604-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-16.04 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -54,9 +51,6 @@ platforms: - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 - - name: ubuntu-1604-master-py3 - driver: - image: saltimages/salt-master-py3:ubuntu-16.04 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -69,9 +63,6 @@ platforms: - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 - - name: fedora-32-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-32 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -134,9 +125,6 @@ platforms: - name: fedora-33-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:fedora-33 - - name: fedora-32-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:fedora-32 - name: amazonlinux-2-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:amazonlinux-2 @@ -171,9 +159,6 @@ platforms: - name: ubuntu-1804-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:ubuntu-16.04 - name: centos-8-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:centos-8 @@ -186,9 +171,6 @@ platforms: - name: fedora-33-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:fedora-33 - - name: fedora-32-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:fedora-32 - name: amazonlinux-2-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:amazonlinux-2 @@ -243,9 +225,6 @@ platforms: - name: ubuntu-1804-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:ubuntu-16.04 - name: centos-8-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:centos-8 @@ -258,9 +237,6 @@ platforms: - name: fedora-33-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:fedora-33 - - name: fedora-32-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:fedora-32 - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -310,9 +286,6 @@ platforms: - name: ubuntu-1804-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-16.04 - name: centos-8-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-8 @@ -339,9 +312,6 @@ platforms: - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-16.04 - name: arch-base-latest-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:arch-base-latest From 6a42a9bdf84e764cb4b3313ad2b6d95688517dec Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 2 Jul 2021 00:04:51 +0100 Subject: [PATCH 45/45] ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335 --- .gitlab-ci.yml | 60 ++++--- .pre-commit-config.yaml | 11 ++ .travis.yml | 60 ++++--- Gemfile.lock | 2 +- kitchen.yml | 186 ++++++++++++++------- test/integration/default/inspec.yml | 2 + test/integration/passenger/inspec.yml | 2 + test/integration/share/inspec.yml | 2 + test/integration/share/libraries/system.rb | 2 +- 9 files changed, 221 insertions(+), 106 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14ac9eb..2776168 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,6 +132,8 @@ rubocop: # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} +# default-almalinux-8-tiamat-py3: {extends: '.test_instance'} +# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} # default-debian-10-master-py3: {extends: '.test_instance'} # passenger-debian-10-master-py3: {extends: '.test_instance'} debian-10-master-py3: {extends: '.test_instance'} @@ -147,13 +149,15 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} # passenger-centos-8-master-py3: {extends: '.test_instance'} centos-8-master-py3: {extends: '.test_instance'} -# default-centos-7-master-py3: {extends: '.test_instance'} +default-centos-7-master-py3: {extends: '.test_instance'} # passenger-centos-7-master-py3: {extends: '.test_instance'} -centos-7-master-py3: {extends: '.test_instance'} +# centos-7-master-py3: {extends: '.test_instance'} default-fedora-34-master-py3: {extends: '.test_instance'} # fedora-34-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} # fedora-33-master-py3: {extends: '.test_instance'} +default-opensuse-leap-153-master-py3: {extends: '.test_instance'} +# opensuse-leap-153-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # opensuse-leap-152-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} @@ -171,20 +175,29 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'} # gentoo-stage3-latest-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} -# default-debian-10-3003-0-py3: {extends: '.test_instance'} -# default-debian-9-3003-0-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} -# default-centos-8-3003-0-py3: {extends: '.test_instance'} -# default-centos-7-3003-0-py3: {extends: '.test_instance'} -# default-fedora-34-3003-0-py3: {extends: '.test_instance'} -# default-fedora-33-3003-0-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} -# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} +# default-almalinux-8-master-py3: {extends: '.test_instance'} +# passenger-almalinux-8-master-py3: {extends: '.test_instance'} +almalinux-8-master-py3: {extends: '.test_instance'} +# default-rockylinux-8-master-py3: {extends: '.test_instance'} +# passenger-rockylinux-8-master-py3: {extends: '.test_instance'} +rockylinux-8-master-py3: {extends: '.test_instance'} +# default-debian-10-3003-1-py3: {extends: '.test_instance'} +# default-debian-9-3003-1-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} +# default-centos-8-3003-1-py3: {extends: '.test_instance'} +# default-centos-7-3003-1-py3: {extends: '.test_instance'} +# default-fedora-34-3003-1-py3: {extends: '.test_instance'} +# default-fedora-33-3003-1-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} # default-debian-10-3002-6-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} @@ -197,8 +210,9 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} # default-arch-base-latest-3002-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} # default-debian-10-3001-7-py3: {extends: '.test_instance'} @@ -209,27 +223,29 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-centos-7-3001-7-py3: {extends: '.test_instance'} # default-fedora-34-3001-7-py3: {extends: '.test_instance'} # default-fedora-33-3001-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} # default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} # default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} # default-arch-base-latest-3001-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'} # default-debian-10-3000-9-py3: {extends: '.test_instance'} # default-debian-9-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} # default-centos-8-3000-9-py3: {extends: '.test_instance'} # default-centos-7-3000-9-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} # default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} # default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bc4109..41b5f35 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,3 +52,14 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + - repo: https://github.com/saltstack-formulas/mirrors-rst-lint + rev: v1.3.2 + hooks: + - id: rst-lint + name: Check reST files using rst-lint + exclude: | + (?x)^( + docs/CHANGELOG.rst| + docs/TOFS_pattern.rst| + )$ + additional_dependencies: [pygments==2.9.0] diff --git a/.travis.yml b/.travis.yml index 74b0bf3..2b7acd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,8 @@ jobs: # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 # - env: INSTANCE=default-oraclelinux-8-tiamat-py3 # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 + # - env: INSTANCE=default-almalinux-8-tiamat-py3 + # - env: INSTANCE=default-rockylinux-8-tiamat-py3 # - env: INSTANCE=default-debian-10-master-py3 # - env: INSTANCE=passenger-debian-10-master-py3 - env: INSTANCE=debian-10-master-py3 @@ -107,13 +109,15 @@ jobs: # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=passenger-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 - # - env: INSTANCE=default-centos-7-master-py3 + - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=passenger-centos-7-master-py3 - - env: INSTANCE=centos-7-master-py3 + # - env: INSTANCE=centos-7-master-py3 - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 # - env: INSTANCE=fedora-33-master-py3 + - env: INSTANCE=default-opensuse-leap-153-master-py3 + # - env: INSTANCE=opensuse-leap-153-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=opensuse-leap-152-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 @@ -131,20 +135,29 @@ jobs: # - env: INSTANCE=gentoo-stage3-latest-master-py3 - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=gentoo-stage3-systemd-master-py3 - # - env: INSTANCE=default-debian-10-3003-0-py3 - # - env: INSTANCE=default-debian-9-3003-0-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-0-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-0-py3 - # - env: INSTANCE=default-centos-8-3003-0-py3 - # - env: INSTANCE=default-centos-7-3003-0-py3 - # - env: INSTANCE=default-fedora-34-3003-0-py3 - # - env: INSTANCE=default-fedora-33-3003-0-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 - # - env: INSTANCE=default-arch-base-latest-3003-0-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3 + # - env: INSTANCE=default-almalinux-8-master-py3 + # - env: INSTANCE=passenger-almalinux-8-master-py3 + - env: INSTANCE=almalinux-8-master-py3 + # - env: INSTANCE=default-rockylinux-8-master-py3 + # - env: INSTANCE=passenger-rockylinux-8-master-py3 + - env: INSTANCE=rockylinux-8-master-py3 + # - env: INSTANCE=default-debian-10-3003-1-py3 + # - env: INSTANCE=default-debian-9-3003-1-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-1-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-1-py3 + # - env: INSTANCE=default-centos-8-3003-1-py3 + # - env: INSTANCE=default-centos-7-3003-1-py3 + # - env: INSTANCE=default-fedora-34-3003-1-py3 + # - env: INSTANCE=default-fedora-33-3003-1-py3 + # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-1-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-1-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-1-py3 + # - env: INSTANCE=default-arch-base-latest-3003-1-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 # - env: INSTANCE=default-debian-10-3002-6-py3 # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 @@ -157,8 +170,9 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 # - env: INSTANCE=default-arch-base-latest-3002-6-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3 + # - env: INSTANCE=default-opensuse-leap-153-3002-2-py3 # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 # - env: INSTANCE=default-debian-10-3001-7-py3 @@ -169,27 +183,29 @@ jobs: # - env: INSTANCE=default-centos-7-3001-7-py3 # - env: INSTANCE=default-fedora-34-3001-7-py3 # - env: INSTANCE=default-fedora-33-3001-7-py3 + # - env: INSTANCE=default-opensuse-leap-153-3001-7-py3 # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 # - env: INSTANCE=default-oraclelinux-8-3001-7-py3 # - env: INSTANCE=default-oraclelinux-7-3001-7-py3 # - env: INSTANCE=default-arch-base-latest-3001-7-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3 # - env: INSTANCE=default-debian-10-3000-9-py3 # - env: INSTANCE=default-debian-9-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 # - env: INSTANCE=default-centos-8-3000-9-py3 # - env: INSTANCE=default-centos-7-3000-9-py3 + # - env: INSTANCE=default-opensuse-leap-153-3000-9-py3 # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 # - env: INSTANCE=default-amazonlinux-2-3000-9-py3 # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 # - env: INSTANCE=default-arch-base-latest-3000-9-py2 - # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/Gemfile.lock b/Gemfile.lock index ef26d96..e2f62f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/kitchen.yml b/kitchen.yml index 176324f..6a38258 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -37,6 +37,12 @@ platforms: - name: oraclelinux-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:oraclelinux-7 + - name: almalinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:almalinux-8 + - name: rockylinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:rockylinux-8 ## SALT `master` - name: debian-10-master-py3 @@ -63,6 +69,14 @@ platforms: - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 + - name: opensuse-leap-153-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -99,52 +113,82 @@ platforms: - name: gentoo-stage3-systemd-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd + - name: almalinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:almalinux-8 + - name: rockylinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.0` - - name: debian-10-3003-0-py3 + ## SALT `3003.1` + - name: debian-10-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-10 - - name: debian-9-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-10 + - name: debian-9-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-9 - - name: ubuntu-2004-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-9 + - name: ubuntu-2004-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-20.04 - - name: ubuntu-1804-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-18.04 - - name: centos-8-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-18.04 + - name: centos-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-8 - - name: centos-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-8 + - name: centos-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-7 - - name: fedora-34-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-7 + - name: fedora-34-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-34 - - name: fedora-33-3003-0-py3 + image: saltimages/salt-3003.1-py3:fedora-34 + - name: fedora-33-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-33 - - name: amazonlinux-2-3003-0-py3 + image: saltimages/salt-3003.1-py3:fedora-33 + - name: opensuse-leap-153-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:amazonlinux-2 - - name: oraclelinux-8-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:oraclelinux-8 - - name: oraclelinux-7-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:oraclelinux-7 - - name: arch-base-latest-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:arch-base-latest + image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 run_command: /usr/lib/systemd/systemd - - name: gentoo-stage3-latest-3003-0-py3 + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-152-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:gentoo-stage3-latest + image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:amazonlinux-2 + - name: oraclelinux-8-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:oraclelinux-8 + - name: oraclelinux-7-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:oraclelinux-7 + - name: arch-base-latest-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:arch-base-latest + run_command: /usr/lib/systemd/systemd + - name: gentoo-stage3-latest-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-0-py3 + - name: gentoo-stage3-systemd-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd + image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd ## SALT `3002.6` - name: debian-10-3002-6-py3 @@ -184,17 +228,23 @@ platforms: driver: image: saltimages/salt-3002.6-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - ## SALT `3002.5` - - name: gentoo-stage3-latest-3002-5-py3 + - name: gentoo-stage3-latest-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:gentoo-stage3-latest + image: saltimages/salt-3002.6-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3002-5-py3 + - name: gentoo-stage3-systemd-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd + image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd ## SALT `3002.2` + - name: opensuse-leap-153-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 @@ -237,6 +287,14 @@ platforms: - name: fedora-33-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:fedora-33 + - name: opensuse-leap-153-3001-7-py3 + driver: + image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -266,15 +324,13 @@ platforms: driver: image: saltimages/salt-3001.7-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - ## SALT `3001.6` - - name: gentoo-stage3-latest-3001-6-py3 + - name: gentoo-stage3-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:gentoo-stage3-latest + image: saltimages/salt-3001.7-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3001-6-py3 + - name: gentoo-stage3-systemd-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd + image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd ## SALT `3000.9` - name: debian-10-3000-9-py3 @@ -292,6 +348,14 @@ platforms: - name: centos-7-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-7 + - name: opensuse-leap-153-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 @@ -309,6 +373,13 @@ platforms: - name: oraclelinux-7-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 @@ -317,15 +388,6 @@ platforms: image: saltimages/salt-3000.9-py2:arch-base-latest run_command: /usr/lib/systemd/systemd - ## SALT `3000.8` - - name: gentoo-stage3-latest-3000-8-py3 - driver: - image: saltimages/salt-3000.8-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3000-8-py3 - driver: - image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd - provisioner: name: salt_solo log_level: debug @@ -375,6 +437,8 @@ suites: - centos-8-tiamat-py3 - centos-7-tiamat-py3 - oraclelinux-8-tiamat-py3 + - almalinux-8-tiamat-py3 + - rockylinux-8-tiamat-py3 - debian-10-master-py3 - debian-9-master-py3 - ubuntu-2004-master-py3 @@ -382,13 +446,15 @@ suites: - centos-8-master-py3 - centos-7-master-py3 - oraclelinux-8-master-py3 - - debian-10-3003-0-py3 - - debian-9-3003-0-py3 - - ubuntu-2004-3003-0-py3 - - ubuntu-1804-3003-0-py3 - - centos-8-3003-0-py3 - - centos-7-3003-0-py3 - - oraclelinux-8-3003-0-py3 + - almalinux-8-master-py3 + - rockylinux-8-master-py3 + - debian-10-3003-1-py3 + - debian-9-3003-1-py3 + - ubuntu-2004-3003-1-py3 + - ubuntu-1804-3003-1-py3 + - centos-8-3003-1-py3 + - centos-7-3003-1-py3 + - oraclelinux-8-3003-1-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 - ubuntu-2004-3002-6-py3 diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 9c0d834..987eb15 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -22,4 +22,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/passenger/inspec.yml b/test/integration/passenger/inspec.yml index 02ea98d..19741ce 100644 --- a/test/integration/passenger/inspec.yml +++ b/test/integration/passenger/inspec.yml @@ -22,4 +22,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml index cf623a1..ee20080 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -19,4 +19,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 461dea4..87daf08 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -36,7 +36,7 @@ class SystemResource < Inspec.resource(1) def build_platform_name case inspec.platform[:name] - when 'amazon', 'oracle' + when 'amazon', 'oracle', 'rocky' "#{inspec.platform[:name]}linux" when /^windows_/ inspec.platform[:family]