Centos is missing folder /etc/ssl/private (#33)
* creating parent folder as it is missing for centos
* fix sphinx
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 2d7b736..0f7c33c 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -14,4 +14,4 @@
prometheus:
enabled: true
telegraf:
- enabled: true
\ No newline at end of file
+ enabled: true
diff --git a/nginx/meta/sphinx.yml b/nginx/meta/sphinx.yml
index 232b222..72d75ce 100644
--- a/nginx/meta/sphinx.yml
+++ b/nginx/meta/sphinx.yml
@@ -7,7 +7,7 @@
name: Server
param:
version:
- value: "{{ salt['cmd.run']('nginx -v 2>/dev/null || echo "unknown"')|replace("nginx version: ", '') }}"
+ value: "{{ salt['cmd.shell']('nginx -v 2>/dev/null || echo "unknown"', python_shell=True)|replace("nginx version: ", '') }}"
bind_host:
name: Bind host
value: {{ server.bind.address }}
diff --git a/nginx/server.sls b/nginx/server.sls
index 18e0dd9..baee6a1 100644
--- a/nginx/server.sls
+++ b/nginx/server.sls
@@ -34,6 +34,22 @@
- watch_in:
- service: nginx_service
+{%- if not salt['file.directory_exists']('/etc/ssl/private') %}
+/etc/ssl/private:
+ file.directory:
+ - mode: 0710
+ - user: root
+ - group: root
+ - makedirs: true
+ - require:
+ - pkg: nginx_packages
+{%- else %}
+/etc/ssl/private:
+ file.directory:
+ - require:
+ - pkg: nginx_packages
+{%- endif %}
+
{%- if server.stream is defined %}
/etc/nginx/stream.conf:
file.managed:
diff --git a/nginx/server/sites.sls b/nginx/server/sites.sls
index d942fdd..fb35732 100644
--- a/nginx/server/sites.sls
+++ b/nginx/server/sites.sls
@@ -42,6 +42,7 @@
- mode: 400
- require:
- pkg: nginx_packages
+ - file: /etc/ssl/private
- watch_in:
- cmd: nginx_init_{{ site.host.name }}_tls