saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #177 from Perceptyx/fix_config_require

Browse Source 
Servers config should require available/enabled dirs
This commit is contained in:
N 2019-01-23 20:09:15 +00:00 committed by GitHub
commit 698f7cc724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/ng/map.jinja
View File

@ -154,7 +154,9 @@
'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
nginx/ng/servers_config.sls
View File

@ -112,6 +112,8 @@ nginx_server_available_dir:
- 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() }}