Browse Source

Merge pull request #218 from daks/context-fix

fix: corrected indentation on context in file.managed states
tags/v0.55.0
Imran Iqbal 5 years ago
parent
commit
8ded496de6
No account linked to committer's email address
5 changed files with 8 additions and 8 deletions
  1. +2
    -2
      nginx/common.sls
  2. +1
    -1
      nginx/ng/passenger.sls
  3. +3
    -3
      nginx/source.sls
  4. +1
    -1
      nginx/sysvinit.sls
  5. +1
    -1
      nginx/upstart.sls

+ 2
- 2
nginx/common.sls View File

- require: - require:
- file: {{ conf_dir }} - file: {{ conf_dir }}
- context: - context:
default_user: {{ nginx_map.default_user }}
default_group: {{ nginx_map.default_group }}
default_user: {{ nginx_map.default_user }}
default_group: {{ nginx_map.default_group }}


{% if nginx.get('init_conf_dirs', True) %} {% if nginx.get('init_conf_dirs', True) %}
{% for dir in ('sites-enabled', 'sites-available') %} {% for dir in ('sites-enabled', 'sites-available') %}

+ 1
- 1
nginx/ng/passenger.sls View File

- source: salt://nginx/ng/files/nginx.conf - source: salt://nginx/ng/files/nginx.conf
- template: jinja - template: jinja
- context: - context:
config: {{ nginx.passenger|json() }}
config: {{ nginx.passenger|json() }}
- watch_in: - watch_in:
- service: nginx_service - service: nginx_service
- require_in: - require_in:

+ 3
- 3
nginx/source.sls View File

- group: root - group: root
- mode: 0755 - mode: 0755
- context: - context:
service_name: {{ service_name }}
sbin_dir: {{ sbin_dir }}
pid_path: {{ pid_path }}
service_name: {{ service_name }}
sbin_dir: {{ sbin_dir }}
pid_path: {{ pid_path }}
{% endif %} {% endif %}
service: service:
{% if service_enable %} {% if service_enable %}

+ 1
- 1
nginx/sysvinit.sls View File

- salt://nginx/templates/{{ grains['os_family'] }}-sysvinit-logger.jinja - salt://nginx/templates/{{ grains['os_family'] }}-sysvinit-logger.jinja
- salt://nginx/templates/sysvinit-logger.jinja - salt://nginx/templates/sysvinit-logger.jinja
- context: - context:
type: {{ log_type }}
type: {{ log_type }}
service: service:
- running - running
- enable: True - enable: True

+ 1
- 1
nginx/upstart.sls View File

- mode: 440 - mode: 440
- source: salt://nginx/templates/upstart-logger.jinja - source: salt://nginx/templates/upstart-logger.jinja
- context: - context:
type: {{ log_type }}
type: {{ log_type }}
service: service:
- running - running
- enable: True - enable: True

Loading…
Cancel
Save