saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace source for source_path variable name in nginx.conf file

Browse Source
This commit is contained in:
David Seira 2017-08-31 13:22:55 +02:00 committed by David Seira
parent bc7f8f4970
commit 8c0259c593
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/ng/config.sls
View File

@ -12,7 +12,7 @@ nginx_log_dir:
- group: {{ nginx.server.config.user }} - group: {{ nginx.server.config.user }}
{% endif %} {% endif %}
{% if 'source' in nginx.server.config %} {% if 'source_path' in nginx.server.config %}
{% set source_path = nginx.server.config.source %} {% set source_path = nginx.server.config.source %}
{% else %} {% else %}
{% set source_path = 'salt://nginx/ng/files/nginx.conf' %} {% set source_path = 'salt://nginx/ng/files/nginx.conf' %}
@ -23,7 +23,7 @@ nginx_config:
- name: {{ nginx.lookup.conf_file }} - name: {{ nginx.lookup.conf_file }}
- source: {{ source_path }} - source: {{ source_path }}
- template: jinja - template: jinja
{% if 'source' not in nginx.server.config %} {% if 'source_path' not in nginx.server.config %}
- context: - context:
config: {{ nginx.server.config|json() }} config: {{ nginx.server.config|json() }}
{% endif %} {% endif %}