3 files changed, 7 insertions, 1 deletions
diff --git a/salt/openbook/admin_api_server/files/Dockerfile b/salt/openbook/admin_api_server/files/Dockerfile
index f6d22ba..7f4125a 100644
--- a/salt/openbook/admin_api_server/files/Dockerfile
+++ b/salt/openbook/admin_api_server/files/Dockerfile
@@ -4,5 +4,7 @@ ADD docker-start.tar.xz /
 EXPOSE 8083 5701 5702
 VOLUME {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}
 VOLUME {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}
+VOLUME /etc/ssl/certs
+VOLUME /etc/ssl/private
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json
index 5b457a2..c110a67 100644
--- a/salt/openbook/admin_api_server/files/admin_api_server.json
+++ b/salt/openbook/admin_api_server/files/admin_api_server.json
@@ -17,5 +17,9 @@
     ,"application.port": {{ openbook_admin_api_server_port }}
     ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"]
 {% endif %}
+{% if openbook_ssl_cert and openbook_ssl_key %}
+    ,"ssl.cert.path": "{{ openbook_ssl_cert }}"
+    ,"ssl.key.path": "{{ openbook_ssl_key }}"
+{% endif %}
 {% endraw %}
 }
diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh
index a09c30d..b98d6cc 100644
--- a/salt/openbook/admin_api_server/files/run.sh
+++ b/salt/openbook/admin_api_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}
+docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}
 exit 0