* Route all to `nginx/deprecated.sls`

5 years ago · 46dff1596a
--- a/nginx/common.sls
+++ b/nginx/common.sls
 include:
  - nginx.deprecated
--- a/nginx/deprecated.sls
+++ b/nginx/deprecated.sls
 # -*- 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
--- a/nginx/init.sls
+++ b/nginx/init.sls
 #
 # 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
  nginx_config:
    file:
      - require:
        {% if nginx.install_from_source %}
        {%- if nginx.install_from_source %}
        - cmd: nginx_install
        {% else %}
        {%- else %}
        - pkg: nginx_install
        {% endif %}
        {%- endif %}
--- a/nginx/luajit2.sls
+++ b/nginx/luajit2.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/certificates.sls
+++ b/nginx/ng/certificates.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/config.sls
+++ b/nginx/ng/config.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/init.sls
+++ b/nginx/ng/init.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/passenger.sls
+++ b/nginx/ng/passenger.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/pkg.sls
+++ b/nginx/ng/pkg.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/servers.sls
+++ b/nginx/ng/servers.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/servers_config.sls
+++ b/nginx/ng/servers_config.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/service.sls
+++ b/nginx/ng/service.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/snippets.sls
+++ b/nginx/ng/snippets.sls
 include:
  - nginx.deprecated
--- a/nginx/ng/src.sls
+++ b/nginx/ng/src.sls
 include:
  - nginx.deprecated
--- a/nginx/openresty.sls
+++ b/nginx/openresty.sls
 include:
  - nginx.deprecated
--- a/nginx/package.sls
+++ b/nginx/package.sls
 include:
  - nginx.deprecated
--- a/nginx/source.sls
+++ b/nginx/source.sls
 include:
  - nginx.deprecated
--- a/nginx/sysvinit.sls
+++ b/nginx/sysvinit.sls
 include:
  - nginx.deprecated
--- a/nginx/upstart.sls
+++ b/nginx/upstart.sls
 include:
  - nginx.deprecated
--- a/nginx/users.sls
+++ b/nginx/users.sls
 include:
  - nginx.deprecated