Browse Source

Merge pull request #177 from Perceptyx/fix_config_require

Servers config should require available/enabled dirs
tags/v0.55.0
N 6 years ago
parent
commit
698f7cc724
No account linked to committer's email address
2 changed files with 5 additions and 1 deletions
  1. +3
    -1
      nginx/ng/map.jinja
  2. +2
    -0
      nginx/ng/servers_config.sls

+ 3
- 1
nginx/ng/map.jinja View File

'disabled_postfix': '.disabled', 'disabled_postfix': '.disabled',
'symlink_opts': {}, 'symlink_opts': {},
'rename_opts': {}, 'rename_opts': {},
'managed_opts': {},
'managed_opts': {
'makedirs': True,
},
'dir_opts': { 'dir_opts': {
'makedirs': True, 'makedirs': True,
}, },

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

- name: {{ server_curpath(server) }} - name: {{ server_curpath(server) }}
- source: {{ source_path }} - source: {{ source_path }}
- template: jinja - template: jinja
- require_in:
- service: nginx_service
{% if 'source_path' not in settings.config %} {% if 'source_path' not in settings.config %}
- context: - context:
config: {{ settings.config|json() }} config: {{ settings.config|json() }}

Loading…
Cancel
Save