summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-11-27 12:06:56 -0700
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-11-27 12:06:56 -0700
commitc259610af157e155cb0330544afe04df2632c29d (patch)
tree12496b16bf9ac6780001018b95f5ee00c568bad5
parenta7be31ec4d3664fa5e70929998f60331ddce411a (diff)
Add SSL cert support to Openbook config files
Issue: IS-33
-rw-r--r--salt/openbook/admin_api_server/files/admin_api_server.json4
-rw-r--r--salt/openbook/admin_web_ui/files/admin_web_ui.json4
-rw-r--r--salt/openbook/customer_api_server/files/customer_api_server.json6
-rw-r--r--salt/openbook/customer_web_ui/files/customer_web_ui.json4
-rw-r--r--salt/openbook/job_scheduler_server/files/job_scheduler_server.json4
-rw-r--r--salt/openbook/workflow_server/files/workflow_server.json4
6 files changed, 25 insertions, 1 deletions
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 %}
}