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

Replace source for source_path variable name

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

6
nginx/ng/servers_config.sls
View File

@ -85,8 +85,8 @@ nginx_server_available_dir:
# Managed enabled/disabled state for servers # Managed enabled/disabled state for servers
{% for server, settings in nginx.servers.managed.items() %} {% for server, settings in nginx.servers.managed.items() %}
{% if settings.config != None %} {% if settings.config != None %}
{% if 'source' in settings.config %} {% if 'source_path' in settings.config %}
{% set source_path = settings.config.source %} {% set source_path = settings.config.source_path %}
{% else %} {% else %}
{% set source_path = 'salt://nginx/ng/files/server.conf' %} {% set source_path = 'salt://nginx/ng/files/server.conf' %}
{% endif %} {% endif %}
@ -97,7 +97,7 @@ nginx_server_available_dir:
- name: {{ server_curpath(server) }} - name: {{ server_curpath(server) }}
- source: {{ source_path }} - source: {{ source_path }}
- template: jinja - template: jinja
{% if 'source' not in settings.config %} {% if 'source_path' not in settings.config %}
- context: - context:
config: {{ settings.config|json() }} config: {{ settings.config|json() }}
{% endif %} {% endif %}

6
pillar.example
View File

@ -77,7 +77,7 @@ nginx:
# nginx.conf (main server) declarations # nginx.conf (main server) declarations
# dictionaries map to blocks {} and lists cause the same declaration to repeat with different values # dictionaries map to blocks {} and lists cause the same declaration to repeat with different values
config: config:
source: salt://path_to_nginx_conf_file/nginx.conf # IMPORTANT: This option is mutually exclusive with the rest of the source_path: salt://path_to_nginx_conf_file/nginx.conf # IMPORTANT: This option is mutually exclusive with the rest of the
# options; if it is found other options (worker_processes: 4 and so # options; if it is found other options (worker_processes: 4 and so
# on) are not processed and just upload the file from source # on) are not processed and just upload the file from source
worker_processes: 4 worker_processes: 4
@ -141,12 +141,12 @@ nginx:
# test something else; # test something else;
# } # }
# } # }
mysite2: # Using source options to upload the file instead of templating all the file mysite2: # Using source_path options to upload the file instead of templating all the file
enabled: True enabled: True
available_dir: /etc/nginx/sites-available available_dir: /etc/nginx/sites-available
enabled_dir: /etc/nginx/sites-enabled enabled_dir: /etc/nginx/sites-enabled
config: config:
source: salt://path-to-site-file/mysite2 source_path: salt://path-to-site-file/mysite2
certificates_path: '/etc/nginx/ssl' # Use this if you need to deploy below certificates in a custom path. certificates_path: '/etc/nginx/ssl' # Use this if you need to deploy below certificates in a custom path.
# If you're doing SSL termination, you can deploy certificates this way. # If you're doing SSL termination, you can deploy certificates this way.