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](https://github.com/myii)|82
-|[@aboe76](https://github.com/aboe76)|46
-|[@gravyboat](https://github.com/gravyboat)|27
-|[@nmadhok](https://github.com/nmadhok)|24
-|[@noelmcloughlin](https://github.com/noelmcloughlin)|18
-|[@whiteinge](https://github.com/whiteinge)|17
-|[@ross-p](https://github.com/ross-p)|13
-|[@daks](https://github.com/daks)|11
-|[@techhat](https://github.com/techhat)|10
-|[@javierbertoli](https://github.com/javierbertoli)|9
-|[@arthurlogilab](https://github.com/arthurlogilab)|8
-|[@cheuschober](https://github.com/cheuschober)|8
-|[@dseira](https://github.com/dseira)|8
-|[@amontalban](https://github.com/amontalban)|7
-|[@puneetk](https://github.com/puneetk)|7
-|[@TaiSHiNet](https://github.com/TaiSHiNet)|6
-|[@EvaSDK](https://github.com/EvaSDK)|6
-|[@cackovic](https://github.com/cackovic)|5
-|[@auser](https://github.com/auser)|5
-|[@stp-ip](https://github.com/stp-ip)|5
-|[@ahmadsherif](https://github.com/ahmadsherif)|4
-|[@n-rodriguez](https://github.com/n-rodriguez)|4
-|[@teepark](https://github.com/teepark)|4
-|[@alinefr](https://github.com/alinefr)|3
-|[@devaos](https://github.com/devaos)|3
-|[@bmwiedemann](https://github.com/bmwiedemann)|3
-|[@terminalmage](https://github.com/terminalmage)|3
-|[@imran1008](https://github.com/imran1008)|3
-|[@morsik](https://github.com/morsik)|3
-|[@msciciel](https://github.com/msciciel)|3
-|[@rfairburn](https://github.com/rfairburn)|3
-|[@westurner](https://github.com/westurner)|3
-|[@chris-sanders](https://github.com/chris-sanders)|2
-|[@dafyddj](https://github.com/dafyddj)|2
-|[@UtahDave](https://github.com/UtahDave)|2
-|[@ghtyrant](https://github.com/ghtyrant)|2
-|[@pprkut](https://github.com/pprkut)|2
-|[@jstrunk](https://github.com/jstrunk)|2
-|[@johnkeates](https://github.com/johnkeates)|2
-|[@kmshultz](https://github.com/kmshultz)|2
-|[@malept](https://github.com/malept)|2
-|[@meganlkm](https://github.com/meganlkm)|2
-|[@garrettw](https://github.com/garrettw)|2
-|[@ErisDS](https://github.com/ErisDS)|2
-|[@myoung34](https://github.com/myoung34)|2
-|[@sticky-note](https://github.com/sticky-note)|2
-|[@bebosudo](https://github.com/bebosudo)|1
-|[@aanriot](https://github.com/aanriot)|1
-|[@andrew-vant](https://github.com/andrew-vant)|1
-|[@bemosior](https://github.com/bemosior)|1
-|[@SuperTux88](https://github.com/SuperTux88)|1
-|[@bogdanr](https://github.com/bogdanr)|1
-|[@blbradley](https://github.com/blbradley)|1
-|[@CorwinTanner](https://github.com/CorwinTanner)|1
-|[@fayetted](https://github.com/fayetted)|1
-|[@czarneckid](https://github.com/czarneckid)|1
-|[@statik](https://github.com/statik)|1
-|[@ekristen](https://github.com/ekristen)|1
-|[@jeduardo](https://github.com/jeduardo)|1
-|[@stromnet](https://github.com/stromnet)|1
-|[@bsdlp](https://github.com/bsdlp)|1
-|[@MEschenbacher](https://github.com/MEschenbacher)|1
-|[@renich](https://github.com/renich)|1
-|[@outime](https://github.com/outime)|1
-|[@scub](https://github.com/scub)|1
-|[@thatch45](https://github.com/thatch45)|1
-|[@blarghmatey](https://github.com/blarghmatey)|1
-|[@babilen5](https://github.com/babilen5)|1
-|[@abednarik](https://github.com/abednarik)|1
-|[@francesco-a](https://github.com/francesco-a)|1
-|[@oboyle](https://github.com/oboyle)|1
-|[@bersace](https://github.com/bersace)|1
+|[@myii](https://github.com/myii)|90
+|[@aboe76](https://github.com/aboe76)|46
+|[@gravyboat](https://github.com/gravyboat)|27
+|[@nmadhok](https://github.com/nmadhok)|24
+|[@noelmcloughlin](https://github.com/noelmcloughlin)|18
+|[@whiteinge](https://github.com/whiteinge)|17
+|[@javierbertoli](https://github.com/javierbertoli)|13
+|[@ross-p](https://github.com/ross-p)|13
+|[@daks](https://github.com/daks)|11
+|[@techhat](https://github.com/techhat)|10
+|[@arthurlogilab](https://github.com/arthurlogilab)|8
+|[@cheuschober](https://github.com/cheuschober)|8
+|[@dseira](https://github.com/dseira)|8
+|[@amontalban](https://github.com/amontalban)|7
+|[@puneetk](https://github.com/puneetk)|7
+|[@TaiSHiNet](https://github.com/TaiSHiNet)|6
+|[@EvaSDK](https://github.com/EvaSDK)|6
+|[@cackovic](https://github.com/cackovic)|5
+|[@auser](https://github.com/auser)|5
+|[@stp-ip](https://github.com/stp-ip)|5
+|[@ahmadsherif](https://github.com/ahmadsherif)|4
+|[@n-rodriguez](https://github.com/n-rodriguez)|4
+|[@teepark](https://github.com/teepark)|4
+|[@alinefr](https://github.com/alinefr)|3
+|[@devaos](https://github.com/devaos)|3
+|[@bmwiedemann](https://github.com/bmwiedemann)|3
+|[@dafyddj](https://github.com/dafyddj)|3
+|[@terminalmage](https://github.com/terminalmage)|3
+|[@imran1008](https://github.com/imran1008)|3
+|[@morsik](https://github.com/morsik)|3
+|[@msciciel](https://github.com/msciciel)|3
+|[@rfairburn](https://github.com/rfairburn)|3
+|[@westurner](https://github.com/westurner)|3
+|[@chris-sanders](https://github.com/chris-sanders)|2
+|[@UtahDave](https://github.com/UtahDave)|2
+|[@ghtyrant](https://github.com/ghtyrant)|2
+|[@pprkut](https://github.com/pprkut)|2
+|[@jstrunk](https://github.com/jstrunk)|2
+|[@johnkeates](https://github.com/johnkeates)|2
+|[@kmshultz](https://github.com/kmshultz)|2
+|[@malept](https://github.com/malept)|2
+|[@meganlkm](https://github.com/meganlkm)|2
+|[@garrettw](https://github.com/garrettw)|2
+|[@ErisDS](https://github.com/ErisDS)|2
+|[@myoung34](https://github.com/myoung34)|2
+|[@sticky-note](https://github.com/sticky-note)|2
+|[@bebosudo](https://github.com/bebosudo)|1
+|[@aanriot](https://github.com/aanriot)|1
+|[@andrew-vant](https://github.com/andrew-vant)|1
+|[@bemosior](https://github.com/bemosior)|1
+|[@SuperTux88](https://github.com/SuperTux88)|1
+|[@bogdanr](https://github.com/bogdanr)|1
+|[@blbradley](https://github.com/blbradley)|1
+|[@CorwinTanner](https://github.com/CorwinTanner)|1
+|[@fayetted](https://github.com/fayetted)|1
+|[@baby-gnu](https://github.com/baby-gnu)|1
+|[@czarneckid](https://github.com/czarneckid)|1
+|[@statik](https://github.com/statik)|1
+|[@ekristen](https://github.com/ekristen)|1
+|[@jeduardo](https://github.com/jeduardo)|1
+|[@stromnet](https://github.com/stromnet)|1
+|[@bsdlp](https://github.com/bsdlp)|1
+|[@MEschenbacher](https://github.com/MEschenbacher)|1
+|[@renich](https://github.com/renich)|1
+|[@outime](https://github.com/outime)|1
+|[@scub](https://github.com/scub)|1
+|[@thatch45](https://github.com/thatch45)|1
+|[@blarghmatey](https://github.com/blarghmatey)|1
+|[@babilen5](https://github.com/babilen5)|1
+|[@abednarik](https://github.com/abednarik)|1
+|[@francesco-a](https://github.com/francesco-a)|1
+|[@oboyle](https://github.com/oboyle)|1
+|[@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:``
+ * - :raw-html-m2r:``
- `@myii `_
- - 82
- * - :raw-html-m2r:``
+ - 90
+ * - :raw-html-m2r:``
- `@aboe76 `_
- 46
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@gravyboat `_
- 27
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@nmadhok `_
- 24
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@noelmcloughlin `_
- 18
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@whiteinge `_
- 17
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@javierbertoli `_
+ - 13
+ * - :raw-html-m2r:``
- `@ross-p `_
- 13
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@daks `_
- 11
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@techhat `_
- 10
- * - :raw-html-m2r:``
- - `@javierbertoli `_
- - 9
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@arthurlogilab `_
- 8
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@cheuschober `_
- 8
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@dseira `_
- 8
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@amontalban `_
- 7
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@puneetk `_
- 7
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@TaiSHiNet `_
- 6
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@EvaSDK `_
- 6
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@cackovic `_
- 5
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@auser `_
- 5
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@stp-ip `_
- 5
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@ahmadsherif `_
- 4
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@n-rodriguez `_
- 4
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@teepark `_
- 4
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@alinefr `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@devaos `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@bmwiedemann `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@dafyddj `_
+ - 3
+ * - :raw-html-m2r:``
- `@terminalmage `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@imran1008 `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@morsik `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@msciciel `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@rfairburn `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@westurner `_
- 3
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@chris-sanders `_
- 2
- * - :raw-html-m2r:``
- - `@dafyddj `_
- - 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@UtahDave `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@ghtyrant `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@pprkut `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@jstrunk `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@johnkeates `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@kmshultz `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@malept `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@meganlkm `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@garrettw `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@ErisDS `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@myoung34 `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@sticky-note `_
- 2
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@bebosudo `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@aanriot `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@andrew-vant `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@bemosior `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@SuperTux88 `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@bogdanr `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@blbradley `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@CorwinTanner `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@fayetted `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
+ - `@baby-gnu `_
+ - 1
+ * - :raw-html-m2r:``
- `@czarneckid `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@statik `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@ekristen `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@jeduardo `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@stromnet `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@bsdlp `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@MEschenbacher `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@renich `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@outime `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@scub `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@thatch45 `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@blarghmatey `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@babilen5 `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@abednarik `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@francesco-a `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@oboyle `_
- 1
- * - :raw-html-m2r:``
+ * - :raw-html-m2r:``
- `@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)
-------------------------------------------------------------------------------------------------------