Skip to content

Commit 46dff15

Browse files
committed
fix: prevent running of states deprecated in v1.0.0
* Route all to `nginx/deprecated.sls`
1 parent 966efd3 commit 46dff15

20 files changed

+77
-6
lines changed

nginx/common.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/deprecated.sls

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
nginx-deprecated-in-v1.0.0-test-fail:
5+
test.fail_without_changes:
6+
- name: |
7+
8+
9+
################################################################################
10+
# #
11+
# WARNING: BREAKING CHANGES SINCE `v1.0.0` #
12+
# #
13+
################################################################################
14+
# #
15+
# Prior to `v1.0.0`, this formula provided two methods for managing NGINX; the #
16+
# old method under `nginx` and the new method under `nginx.ng`. The old method #
17+
# has now been removed and `nginx.ng` has been promoted to be `nginx` in its #
18+
# place. #
19+
# #
20+
# If you are not in a position to migrate, please pin your repo to the final #
21+
# release tag before `v1.0.0`, i.e. `v0.56.1`. #
22+
# #
23+
# To migrate from `nginx.ng`, simply modify your pillar to promote the entire #
24+
# section under `nginx:ng` so that it is under `nginx` instead. So with the #
25+
# editor of your choice, highlight the entire section and then unindent one #
26+
# level. Finish by removing the `ng:` line. #
27+
# #
28+
# To migrate from the old `nginx`, first convert to `nginx.ng` under `v0.56.1` #
29+
# and then follow the steps laid out in the paragraph directly above. #
30+
# #
31+
################################################################################
32+
- failhard: True

nginx/init.sls

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
#
33
# Meta-state to fully install nginx.
44

5-
{% from 'nginx/map.jinja' import nginx, sls_block with context %}
5+
{%- from 'nginx/map.jinja' import nginx, sls_block with context %}
66
77
include:
8+
{%- if nginx.ng is defined %}
9+
- nginx.deprecated
10+
{%- endif %}
811
- nginx.config
912
- nginx.service
10-
{% if nginx.snippets is defined %}
13+
{%- if nginx.snippets is defined %}
1114
- nginx.snippets
12-
{% endif %}
15+
{%- endif %}
1316
- nginx.servers
1417
- nginx.certificates
1518
@@ -23,8 +26,8 @@ extend:
2326
nginx_config:
2427
file:
2528
- require:
26-
{% if nginx.install_from_source %}
29+
{%- if nginx.install_from_source %}
2730
- cmd: nginx_install
28-
{% else %}
31+
{%- else %}
2932
- pkg: nginx_install
30-
{% endif %}
33+
{%- endif %}

nginx/luajit2.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/certificates.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/config.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/init.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/passenger.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/pkg.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/servers.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/servers_config.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/service.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/snippets.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/ng/src.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/openresty.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/package.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/source.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/sysvinit.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/upstart.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

nginx/users.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include:
2+
- nginx.deprecated

0 commit comments

Comments
 (0)