diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea8271b9..9bc41097 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 05856dc7..5383623e 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\.$) diff --git a/AUTHORS.md b/AUTHORS.md index 2f466eba..856c9ff9 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 dcedd76d..14bd24d2 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 8456a9bc..5753d264 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 a06ee28f..677394ba 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 5108799c..5852007e 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) ------------------------------------------------------------------------------------------------------- diff --git a/nginx/certificates.sls b/nginx/certificates.sls index 2a8330b5..8781045f 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 %} diff --git a/nginx/servers_config.sls b/nginx/servers_config.sls index 5dd11a9e..6652d64a 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 d09ba366..f19905ba 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: