Skip to content

Commit 297e3ac

Browse files
committed
fix(certificates.sls): prepare certificates_path dir separately
* Close #241
1 parent 4ba3524 commit 297e3ac

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Diff for: nginx/certificates.sls

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ include:
44
- nginx.service
55
66
{% set certificates_path = salt['pillar.get']('nginx:certificates_path', '/etc/nginx/ssl') %}
7+
prepare_certificates_path_dir:
8+
file.directory:
9+
- name: {{ certificates_path }}
10+
- makedirs: True
711
812
{%- for dh_param, value in salt['pillar.get']('nginx:dh_param', {}).items() %}
913
{%- if value is string %}
@@ -12,19 +16,20 @@ create_nginx_dhparam_{{ dh_param }}_key:
1216
- name: {{ certificates_path }}/{{ dh_param }}
1317
- contents_pillar: nginx:dh_param:{{ dh_param }}
1418
- makedirs: True
19+
- require:
20+
- file: prepare_certificates_path_dir
1521
- watch_in:
1622
- service: nginx_service
1723
{%- else %}
1824
generate_nginx_dhparam_{{ dh_param }}_key:
1925
pkg.installed:
2026
- name: {{ nginx.lookup.openssl_package }}
21-
file.directory:
22-
- name: {{ certificates_path }}
23-
- makedirs: True
2427
cmd.run:
2528
- name: openssl dhparam -out {{ dh_param }} {{ value.get('keysize', 2048) }}
2629
- cwd: {{ certificates_path }}
2730
- creates: {{ certificates_path }}/{{ dh_param }}
31+
- require:
32+
- file: prepare_certificates_path_dir
2833
- watch_in:
2934
- service: nginx_service
3035
{%- endif %}

0 commit comments

Comments
 (0)