Optional SSL certs

salt/files/_api.conf

@@ -5,9 +5,14 @@ rest_cherrypy:
   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) %}