Optional SSL certs
diff --git a/salt/files/_api.conf b/salt/files/_api.conf
index 346563f..3757fb1 100644
--- a/salt/files/_api.conf
+++ b/salt/files/_api.conf
@@ -5,9 +5,14 @@
port: {{ api.bind.port }}
host: {{ api.bind.address }}
{%- if api.get('ssl', {}).get('enabled', False) %}
+ {%- if api.ssl.engine == 'salt' %}
ssl_crt: /etc/ssl/certs/{{ system.name }}.{{ system.domain }}.crt
ssl_key: /etc/ssl/private/{{ system.name }}.{{ system.domain }}.key
{%- else %}
+ ssl_crt: {{ api.ssl.get('cert_file')|default("/etc/ssl/certs/"+grains.get('fqdn')+".crt") }}
+ ssl_crt: {{ api.ssl.get('key_file')|default("/etc/ssl/private/"+grains.get('fqdn')+".key") }}
+ {%- endif %}
+ {%- else %}
disable_ssl: True
{%- endif %}
{%- if api.get('debug', False) %}