Selaa lähdekoodia
Merge pull request #177 from Perceptyx/fix_config_require
Servers config should require available/enabled dirs
tags/v0.55.0
N
6 vuotta sitten
vanhempi
commit
698f7cc724
No account linked to committer's email address
2 muutettua tiedostoa jossa
5 lisäystä ja
1 poistoa
-
nginx/ng/map.jinja
-
nginx/ng/servers_config.sls
|
|
@@ -154,7 +154,9 @@ |
|
|
|
'disabled_postfix': '.disabled', |
|
|
|
'symlink_opts': {}, |
|
|
|
'rename_opts': {}, |
|
|
|
'managed_opts': {}, |
|
|
|
'managed_opts': { |
|
|
|
'makedirs': True, |
|
|
|
}, |
|
|
|
'dir_opts': { |
|
|
|
'makedirs': True, |
|
|
|
}, |
|
|
@@ -112,6 +112,8 @@ nginx_server_available_dir: |
|
|
|
- name: {{ server_curpath(server) }} |
|
|
|
- source: {{ source_path }} |
|
|
|
- template: jinja |
|
|
|
- require_in: |
|
|
|
- service: nginx_service |
|
|
|
{% if 'source_path' not in settings.config %} |
|
|
|
- context: |
|
|
|
config: {{ settings.config|json() }} |