From 57278481de489441a5c04aee544962212e91c5af Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 3 Apr 2021 13:22:21 +0100 Subject: [PATCH 1/8] 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 7451490e..78148a44 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 2/8] 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 ab8dba22..f9a94a4b 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 ad24c19f..2dd5bf89 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 3/8] 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 2dac76a8..4f847677 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 cb9c6d9e..6ca82876 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 4/8] 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 4f847677..9d340488 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 6ca82876..542ba907 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 5/8] 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 67978ff6..a19274b1 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 b505c9bf..f5fec4b3 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-3003.0-py3:debian-10 + - name: debian-9-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:debian-9 + - name: ubuntu-2004-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:ubuntu-18.04 + - name: centos-8-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:centos-8 + - name: centos-7-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:centos-7 + - name: fedora-34-3003-0-py3 + driver: + image: saltimages/salt-3003.0-py3:fedora-34 + - 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 + - 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 + 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.5-py3:debian-10 - - name: debian-9-3002-5-py3 + image: saltimages/salt-3002.6-py3:debian-9 + - name: ubuntu-2004-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:debian-9 - - name: ubuntu-2004-3002-5-py3 + image: saltimages/salt-3002.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-5-py3 + image: saltimages/salt-3002.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-5-py3 + image: saltimages/salt-3002.6-py3:ubuntu-16.04 + - name: centos-8-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-16.04 - - name: centos-8-3002-5-py3 + image: saltimages/salt-3002.6-py3:centos-8 + - name: centos-7-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:centos-8 - - name: centos-7-3002-5-py3 + image: saltimages/salt-3002.6-py3:centos-7 + - name: fedora-34-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:centos-7 - - name: fedora-33-3002-5-py3 + image: saltimages/salt-3002.6-py3:fedora-34 + - name: fedora-33-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:fedora-33 - - name: fedora-32-3002-5-py3 + image: saltimages/salt-3002.6-py3:fedora-33 + - name: fedora-32-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:fedora-32 - - name: amazonlinux-2-3002-5-py3 + image: saltimages/salt-3002.6-py3:fedora-32 + - name: amazonlinux-2-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:amazonlinux-2 - - name: oraclelinux-8-3002-5-py3 + image: saltimages/salt-3002.6-py3:amazonlinux-2 + - name: oraclelinux-8-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-8 - - name: oraclelinux-7-3002-5-py3 + image: saltimages/salt-3002.6-py3:oraclelinux-8 + - name: oraclelinux-7-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:oraclelinux-7 - - name: arch-base-latest-3002-5-py3 + image: saltimages/salt-3002.6-py3:oraclelinux-7 + - name: arch-base-latest-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:arch-base-latest + 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.9-py3:amazonlinux-2 + - name: oraclelinux-8-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:amazonlinux-2 - - name: oraclelinux-8-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-8 - - name: oraclelinux-7-3000-8-py3 + image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: ubuntu-1804-3000-9-py2 driver: - image: saltimages/salt-3000.8-py3:oraclelinux-7 + 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 6/8] 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 82b181fe..3cd00b59 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 09aec68a..5dd11a9e 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 9cbc5cc8..61defa30 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 ce6109b9..7b610ef1 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 95edc522..63a9f544 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 7/8] 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 b505c9bf..db344af0 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 6d7c9991..c2845eb8 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -71,5 +71,16 @@ 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 00000000..57151af8 --- /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 ef6ccfa1..84afe981 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 00000000..e2429275 --- /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 8/8] 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 8e933e71..b96cbf21 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 f8455f57..64050148 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 a7779b5d..c1001d9f 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 8d9701d4..8ffa7473 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 7158a543..a64f2de3 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) -------------------------------------------------------------------------------------------------------