fix: prevent running of states deprecated in v1.0.0

* Route all to `nginx/deprecated.sls`
This commit is contained in:
Imran Iqbal 2019-05-13 05:30:09 +01:00 committed by Imran Iqbal
parent 966efd3013
commit 46dff1596a
20 changed files with 77 additions and 6 deletions

2
nginx/common.sls Normal file
View File

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

32
nginx/deprecated.sls Normal file
View File

@ -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

View File

@ -2,14 +2,17 @@
# #
# Meta-state to fully install nginx. # 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: include:
{%- if nginx.ng is defined %}
- nginx.deprecated
{%- endif %}
- nginx.config - nginx.config
- nginx.service - nginx.service
{% if nginx.snippets is defined %} {%- if nginx.snippets is defined %}
- nginx.snippets - nginx.snippets
{% endif %} {%- endif %}
- nginx.servers - nginx.servers
- nginx.certificates - nginx.certificates
@ -23,8 +26,8 @@ extend:
nginx_config: nginx_config:
file: file:
- require: - require:
{% if nginx.install_from_source %} {%- if nginx.install_from_source %}
- cmd: nginx_install - cmd: nginx_install
{% else %} {%- else %}
- pkg: nginx_install - pkg: nginx_install
{% endif %} {%- endif %}

2
nginx/luajit2.sls Normal file
View File

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

View File

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

2
nginx/ng/config.sls Normal file
View File

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

2
nginx/ng/init.sls Normal file
View File

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

2
nginx/ng/passenger.sls Normal file
View File

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

2
nginx/ng/pkg.sls Normal file
View File

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

2
nginx/ng/servers.sls Normal file
View File

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

View File

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

2
nginx/ng/service.sls Normal file
View File

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

2
nginx/ng/snippets.sls Normal file
View File

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

2
nginx/ng/src.sls Normal file
View File

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

2
nginx/openresty.sls Normal file
View File

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

2
nginx/package.sls Normal file
View File

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

2
nginx/source.sls Normal file
View File

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

2
nginx/sysvinit.sls Normal file
View File

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

2
nginx/upstart.sls Normal file
View File

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

2
nginx/users.sls Normal file
View File

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