瀏覽代碼

fix: prevent running of states deprecated in `v1.0.0`

* Route all to `nginx/deprecated.sls`
tags/v1.0.4
Imran Iqbal 5 年之前
父節點
當前提交
46dff1596a
共有 20 個檔案被更改,包括 77 行新增6 行删除
  1. +2
    -0
      nginx/common.sls
  2. +32
    -0
      nginx/deprecated.sls
  3. +9
    -6
      nginx/init.sls
  4. +2
    -0
      nginx/luajit2.sls
  5. +2
    -0
      nginx/ng/certificates.sls
  6. +2
    -0
      nginx/ng/config.sls
  7. +2
    -0
      nginx/ng/init.sls
  8. +2
    -0
      nginx/ng/passenger.sls
  9. +2
    -0
      nginx/ng/pkg.sls
  10. +2
    -0
      nginx/ng/servers.sls
  11. +2
    -0
      nginx/ng/servers_config.sls
  12. +2
    -0
      nginx/ng/service.sls
  13. +2
    -0
      nginx/ng/snippets.sls
  14. +2
    -0
      nginx/ng/src.sls
  15. +2
    -0
      nginx/openresty.sls
  16. +2
    -0
      nginx/package.sls
  17. +2
    -0
      nginx/source.sls
  18. +2
    -0
      nginx/sysvinit.sls
  19. +2
    -0
      nginx/upstart.sls
  20. +2
    -0
      nginx/users.sls

+ 2
- 0
nginx/common.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 32
- 0
nginx/deprecated.sls 查看文件

@@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

nginx-deprecated-in-v1.0.0-test-fail:
test.fail_without_changes:
- name: |


################################################################################
# #
# WARNING: BREAKING CHANGES SINCE `v1.0.0` #
# #
################################################################################
# #
# Prior to `v1.0.0`, this formula provided two methods for managing NGINX; the #
# old method under `nginx` and the new method under `nginx.ng`. The old method #
# has now been removed and `nginx.ng` has been promoted to be `nginx` in its #
# place. #
# #
# If you are not in a position to migrate, please pin your repo to the final #
# release tag before `v1.0.0`, i.e. `v0.56.1`. #
# #
# To migrate from `nginx.ng`, simply modify your pillar to promote the entire #
# section under `nginx:ng` so that it is under `nginx` instead. So with the #
# editor of your choice, highlight the entire section and then unindent one #
# level. Finish by removing the `ng:` line. #
# #
# To migrate from the old `nginx`, first convert to `nginx.ng` under `v0.56.1` #
# and then follow the steps laid out in the paragraph directly above. #
# #
################################################################################
- failhard: True

+ 9
- 6
nginx/init.sls 查看文件

@@ -2,14 +2,17 @@
#
# Meta-state to fully install nginx.

{% from 'nginx/map.jinja' import nginx, sls_block with context %}
{%- from 'nginx/map.jinja' import nginx, sls_block with context %}

include:
{%- if nginx.ng is defined %}
- nginx.deprecated
{%- endif %}
- nginx.config
- nginx.service
{% if nginx.snippets is defined %}
{%- if nginx.snippets is defined %}
- nginx.snippets
{% endif %}
{%- endif %}
- nginx.servers
- nginx.certificates

@@ -23,8 +26,8 @@ extend:
nginx_config:
file:
- require:
{% if nginx.install_from_source %}
{%- if nginx.install_from_source %}
- cmd: nginx_install
{% else %}
{%- else %}
- pkg: nginx_install
{% endif %}
{%- endif %}

+ 2
- 0
nginx/luajit2.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/certificates.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/config.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/init.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/passenger.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/pkg.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/servers.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/servers_config.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/service.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/snippets.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/ng/src.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/openresty.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/package.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/source.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/sysvinit.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/upstart.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

+ 2
- 0
nginx/users.sls 查看文件

@@ -0,0 +1,2 @@
include:
- nginx.deprecated

Loading…
取消
儲存