diff --git a/AUTHORS.md b/AUTHORS.md index 0d370d0e..3a94d52b 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -8,15 +8,15 @@ Avatar|Contributor|Contributions @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 -@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|15 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|16 @ross-p|[@ross-p](https://github.com/ross-p)|13 @daks|[@daks](https://github.com/daks)|10 @techhat|[@techhat](https://github.com/techhat)|10 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|9 +@myii|[@myii](https://github.com/myii)|9 @arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|8 @cheuschober|[@cheuschober](https://github.com/cheuschober)|8 @dseira|[@dseira](https://github.com/dseira)|8 -@myii|[@myii](https://github.com/myii)|8 @amontalban|[@amontalban](https://github.com/amontalban)|7 @puneetk|[@puneetk](https://github.com/puneetk)|7 @TaiSHiNet|[@TaiSHiNet](https://github.com/TaiSHiNet)|6 @@ -76,4 +76,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-06-03. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-06-19. diff --git a/CHANGELOG.md b/CHANGELOG.md index a3a73dbe..53b51a73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +# [2.0.0](https://github.com/saltstack-formulas/nginx-formula/compare/v1.1.0...v2.0.0) (2019-06-19) + + +### Bug Fixes + +* **snippets:** removed appending of ".conf" ([aa87721](https://github.com/saltstack-formulas/nginx-formula/commit/aa87721)) + + +### BREAKING CHANGES + +* **snippets:** Users have to modify their pillar +according to this commit. Users MUST append '.conf' for their +existing managed snippets. + # [1.1.0](https://github.com/saltstack-formulas/nginx-formula/compare/v1.0.5...v1.1.0) (2019-06-03) diff --git a/FORMULA b/FORMULA index fef5b570..249b14f9 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: 1.1.0 +version: 2.0.0 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index a3d0dcc3..306f87a1 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -27,7 +27,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 17 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - - 15 + - 16 * - :raw-html-m2r:`@ross-p` - `@ross-p `_ - 13 @@ -40,6 +40,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - 9 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 9 * - :raw-html-m2r:`@arthurlogilab` - `@arthurlogilab `_ - 8 @@ -49,9 +52,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@dseira` - `@dseira `_ - 8 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 8 * - :raw-html-m2r:`@amontalban` - `@amontalban `_ - 7 @@ -224,4 +224,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 2019-06-03. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-06-19. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 4941285c..6b777fed 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,23 @@ Changelog ========= +`2.0.0 `_ (2019-06-19) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **snippets:** removed appending of ".conf" (\ `aa87721 `_\ ) + +BREAKING CHANGES +^^^^^^^^^^^^^^^^ + + +* **snippets:** Users have to modify their pillar + according to this commit. Users MUST append '.conf' for their + existing managed snippets. + `1.1.0 `_ (2019-06-03) ------------------------------------------------------------------------------------------------------- diff --git a/nginx/snippets.sls b/nginx/snippets.sls index 1c57ccb0..bd881a93 100644 --- a/nginx/snippets.sls +++ b/nginx/snippets.sls @@ -14,7 +14,7 @@ nginx_snippets_dir: {% for snippet, config in nginx.snippets.items() %} nginx_snippet_{{ snippet }}: file.managed: - - name: {{ nginx.lookup.snippets_dir ~ '/' ~ snippet ~ '.conf' }} + - name: {{ nginx.lookup.snippets_dir ~ '/' ~ snippet }} - source: {{ files_switch([ snippet, 'server.conf' ], 'nginx_snippet_file_managed' ) diff --git a/pillar.example b/pillar.example index 4ecc9ec5..975688e3 100644 --- a/pillar.example +++ b/pillar.example @@ -63,15 +63,15 @@ nginx: ## Files or Templates can be retrieved by TOFS with snippet name ( Fallback to server.conf ) ##--- --- - - - - - - -- - - -- -- - - --- -- - -- - - - -- - - - - -- - - - -- - - - -- - ## snippets: - letsencrypt: + letsencrypt.conf: - location ^~ /.well-known/acme-challenge/: - proxy_pass: http://localhost:9999 - cloudflare_proxy: + cloudflare_proxy.conf: - set_real_ip_from: 103.21.244.0/22 - set_real_ip_from: 103.22.200.0/22 - set_real_ip_from: 104.16.0.0/12 - set_real_ip_from: 108.162.192.0/18 - blacklist: + blacklist.conf: - map $http_user_agent $bad_bot: - default: 0 - '~*^Lynx': 0 @@ -81,7 +81,7 @@ nginx: - '~*bandit': 1 - libwww-perl: 1 - '~(?i)(httrack|htmlparser|libwww)': 1 - upstream_netdata_tcp: + upstream_netdata_tcp.conf: - upstream netdata: - server: 127.0.0.1:19999 - keepalive: 64 diff --git a/test/salt/default/pillar/nginx.sls b/test/salt/default/pillar/nginx.sls index 0439343e..bbdfa69c 100644 --- a/test/salt/default/pillar/nginx.sls +++ b/test/salt/default/pillar/nginx.sls @@ -6,7 +6,7 @@ nginx: snippets: - letsencrypt: + letsencrypt.conf: - location ^~ /.well-known/acme-challenge/: - proxy_pass: http://localhost:9999 server: