From 3ccd9033cc221b1dd9c17fe687737567f619ffa3 Mon Sep 17 00:00:00 2001
From: Steve Woodruff <steve@n9oh.com>
Date: Mon, 13 Jun 2016 23:17:58 -0500
Subject: [PATCH] Allow custom kopf and kibana public ports (#178)

* Allow custom kopf and kibana public ports

* kopf public port is now required

* kibana public port is now required
---
 templates/elasticsearch-2/0/docker-compose.yml  | 2 +-
 templates/elasticsearch-2/0/rancher-compose.yml | 6 ++++++
 templates/kibana/1/docker-compose.yml           | 2 +-
 templates/kibana/1/rancher-compose.yml          | 7 +++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/templates/elasticsearch-2/0/docker-compose.yml b/templates/elasticsearch-2/0/docker-compose.yml
index 3a7a23d..ba48a20 100644
--- a/templates/elasticsearch-2/0/docker-compose.yml
+++ b/templates/elasticsearch-2/0/docker-compose.yml
@@ -98,7 +98,7 @@ elasticsearch-base-clients:
 kopf:
   image: rancher/kopf:v0.4.0
   ports:
-    - "80:80"
+    - "${kopf_port}:80"
   environment:
     KOPF_SERVER_NAME: 'es.dev'
     KOPF_ES_SERVERS: 'es-clients:9200'
diff --git a/templates/elasticsearch-2/0/rancher-compose.yml b/templates/elasticsearch-2/0/rancher-compose.yml
index 47ddf98..31c8e09 100644
--- a/templates/elasticsearch-2/0/rancher-compose.yml
+++ b/templates/elasticsearch-2/0/rancher-compose.yml
@@ -9,6 +9,12 @@
       type: "string"
       required: true
       default: "es"
+    - variable: "kopf_port"
+      label: "Public Port"
+      description: "Unique public port for kopf"
+      type: "int"
+      default: 80
+      required: true
 elasticsearch-masters:
   metadata:
     elasticsearch:
diff --git a/templates/kibana/1/docker-compose.yml b/templates/kibana/1/docker-compose.yml
index 859f6cf..f391db4 100644
--- a/templates/kibana/1/docker-compose.yml
+++ b/templates/kibana/1/docker-compose.yml
@@ -1,6 +1,6 @@
 kibana-vip:
   ports:
-  - 80:80
+  - "${public_port}:80"
   restart: always
   tty: true
   image: rancher/load-balancer-service
diff --git a/templates/kibana/1/rancher-compose.yml b/templates/kibana/1/rancher-compose.yml
index 2a6492c..6a40730 100644
--- a/templates/kibana/1/rancher-compose.yml
+++ b/templates/kibana/1/rancher-compose.yml
@@ -9,6 +9,13 @@
       type: "service"
       required: true
       default: "es/elasticsearch-clients"
+    - variable: "public_port"
+      label: "Public Port"
+      description: "Unique public port for Kibana"
+      type: "int"
+      default: 80
+      required: true
+
 nginx-proxy:
   metadata:
     nginx: