Browse Source

Merge pull request #176 from Perceptyx/fix_pr_172

Fix for PR #172
master
Niels Abspoel 7 years ago
parent
commit
896fdee0dd
No account linked to committer's email address
2 changed files with 23 additions and 0 deletions
  1. +4
    -0
      nginx/ng/servers_config.sls
  2. +19
    -0
      pillar.example

+ 4
- 0
nginx/ng/servers_config.sls View File



{% if settings.enabled != None %} {% if settings.enabled != None %}
{% set status_state_id = 'server_state_' ~ loop.index0 %} {% set status_state_id = 'server_state_' ~ loop.index0 %}
{%- set enabled_dir = path_join(server, nginx.servers.managed.get(server).get('enabled_dir', nginx.lookup.server_enabled)) -%}
{%- set available_dir = path_join(server, nginx.servers.managed.get(server).get('available_dir', nginx.lookup.server_available)) -%}
{%- if enabled_dir != available_dir %}
{{ status_state_id }}: {{ status_state_id }}:
{% if 'deleted' in settings and settings.deleted %} {% if 'deleted' in settings and settings.deleted %}
{{ manage_status(server, False, True) }} {{ manage_status(server, False, True) }}
{% if 'deleted' not in settings or ( 'deleted' in settings and settings.deleted == False ) %} {% if 'deleted' not in settings or ( 'deleted' in settings and settings.deleted == False ) %}
{% do server_states.append(status_state_id) %} {% do server_states.append(status_state_id) %}
{% endif %} {% endif %}
{%- endif %} {# enabled != available_dir #}
{% endif %} {% endif %}
{% endfor %} {% endfor %}

+ 19
- 0
pillar.example View File

config: config:
source_path: salt://path-to-site-file/mysite2 source_path: salt://path-to-site-file/mysite2


# Below configuration becomes handy if you want to create custom configuration files
# for example if you want to create /usr/local/etc/nginx/http_options.conf with
# the following content:

# sendfile on;
# tcp_nopush on;
# tcp_nodelay on;
# send_iowait 12000;

http_options.conf:
enabled: True
available_dir: /usr/local/etc/nginx
enabled_dir: /usr/local/etc/nginx
config:
- sendfile: 'on'
- tcp_nopush: 'on'
- tcp_nodelay: 'on'
- send_iowait: 12000

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.
# The private one(s) should go in a separate pillar file not in version # The private one(s) should go in a separate pillar file not in version

Loading…
Cancel
Save