From c259610af157e155cb0330544afe04df2632c29d Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Mon, 27 Nov 2017 12:06:56 -0700 Subject: Add SSL cert support to Openbook config files Issue: IS-33 --- salt/openbook/admin_api_server/files/admin_api_server.json | 4 ++++ salt/openbook/admin_web_ui/files/admin_web_ui.json | 4 ++++ salt/openbook/customer_api_server/files/customer_api_server.json | 6 +++++- salt/openbook/customer_web_ui/files/customer_web_ui.json | 4 ++++ salt/openbook/job_scheduler_server/files/job_scheduler_server.json | 4 ++++ salt/openbook/workflow_server/files/workflow_server.json | 4 ++++ 6 files changed, 25 insertions(+), 1 deletion(-) 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_web_ui/files/admin_web_ui.json b/salt/openbook/admin_web_ui/files/admin_web_ui.json index c41570a..c35a25c 100644 --- a/salt/openbook/admin_web_ui/files/admin_web_ui.json +++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json @@ -5,5 +5,9 @@ ,"application.port": {{ openbook_admin_web_ui_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/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json index 7704b40..767fa97 100644 --- a/salt/openbook/customer_api_server/files/customer_api_server.json +++ b/salt/openbook/customer_api_server/files/customer_api_server.json @@ -16,6 +16,10 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_customer_api_server_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] - {% endif %} +{% 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/customer_web_ui/files/customer_web_ui.json b/salt/openbook/customer_web_ui/files/customer_web_ui.json index e6a78be..5979275 100644 --- a/salt/openbook/customer_web_ui/files/customer_web_ui.json +++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json @@ -5,5 +5,9 @@ ,"application.port": {{ openbook_customer_web_ui_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/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json index 1decfa2..456e850 100644 --- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json +++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json @@ -15,5 +15,9 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"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/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json index f1187e5..541cbf3 100644 --- a/salt/openbook/workflow_server/files/workflow_server.json +++ b/salt/openbook/workflow_server/files/workflow_server.json @@ -15,5 +15,9 @@ ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"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 %} } -- cgit v1.3