Merge pull request #218 from daks/context-fix

fix: corrected indentation on context in file.managed states
This commit is contained in:
Imran Iqbal 2019-04-11 17:14:29 +01:00 committed by GitHub
commit 8ded496de6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -45,8 +45,8 @@
- require: - require:
- file: {{ conf_dir }} - file: {{ conf_dir }}
- context: - context:
default_user: {{ nginx_map.default_user }} default_user: {{ nginx_map.default_user }}
default_group: {{ nginx_map.default_group }} 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') %}

View File

@ -30,7 +30,7 @@ passenger_config:
- 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:

View File

@ -239,9 +239,9 @@ nginx:
- group: root - group: root
- mode: 0755 - mode: 0755
- context: - context:
service_name: {{ service_name }} service_name: {{ service_name }}
sbin_dir: {{ sbin_dir }} sbin_dir: {{ sbin_dir }}
pid_path: {{ pid_path }} pid_path: {{ pid_path }}
{% endif %} {% endif %}
service: service:
{% if service_enable %} {% if service_enable %}

View File

@ -19,7 +19,7 @@ nginx-logger-{{ log_type }}:
- 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

View File

@ -14,7 +14,7 @@ nginx-logger-{{ log_type }}:
- 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