From f377ca033e08fd348b0412b6e078be5d80cbd7ae Mon Sep 17 00:00:00 2001
From: Denise <denise@rancher.com>
Date: Sat, 8 Apr 2017 12:18:40 -0700
Subject: [PATCH] Fixes for typo in zammad template and match the service in
 rancher-compose with docker-compose (#481)

* fix typo

* update service name to match services in docker-compose.yml
---
 templates/nuxeo/0/rancher-compose.yml  | 14 +++++++-------
 templates/zammad/0/rancher-compose.yml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/nuxeo/0/rancher-compose.yml b/templates/nuxeo/0/rancher-compose.yml
index 34b9a61..9b86fb7 100644
--- a/templates/nuxeo/0/rancher-compose.yml
+++ b/templates/nuxeo/0/rancher-compose.yml
@@ -2,7 +2,7 @@
   name: "Nuxeo Platform"
   version: 8.1-rancher1
   description: |
-    Enterprise Content Management 
+    Enterprise Content Management
     Platform for Business Applications
   uuid: nuxeo-1
   questions:
@@ -16,14 +16,14 @@
       type: "string"
       label: "List of Nuxeo packages"
       description: |
-        List of Nuxeo packages 
+        List of Nuxeo packages
       default: nuxeo-web-mobile nuxeo-drive nuxeo-diff nuxeo-spreadsheet nuxeo-dam nuxeo-template-rendering nuxeo-template-rendering-samples nuxeo-showcase-content
     - variable: url
       description: "The URL that this nuxeo instance should serve"
       label: "Nuxeo URL"
       type: "string"
       required: true
-      default: "http://localhost:8080/"    
+      default: "http://localhost:8080/"
     - variable: volumedriver
       type: "string"
       label: "Volume driver"
@@ -40,14 +40,14 @@ nuxeo:
     interval: 5000
     unhealthy_threshold: 5
     # For TCP, request_line needs to be ''
-    # TCP Example: 
+    # TCP Example:
     # request_line: ''
-    request_line: GET /nuxeo/login.jsp 
+    request_line: GET /nuxeo/login.jsp
     healthy_threshold: 2
     # Response timeout is measured in milliseconds
     response_timeout: 2000
 
-elasticsearch:
+elasticsearch-masters:
   metadata:
     elasticsearch:
       yml:
@@ -67,4 +67,4 @@ lb:
     interval: 2000
     unhealthy_threshold: 3
     healthy_threshold: 2
-    response_timeout: 2000
\ No newline at end of file
+    response_timeout: 2000
diff --git a/templates/zammad/0/rancher-compose.yml b/templates/zammad/0/rancher-compose.yml
index 01a021c..8ff8ee5 100644
--- a/templates/zammad/0/rancher-compose.yml
+++ b/templates/zammad/0/rancher-compose.yml
@@ -23,7 +23,7 @@ zammad-scheduler:
   start_on_create: true
 zammad-railsserver:
   scale: 1
-  tart_on_create: true
+  start_on_create: true
 zammad-websocket:
   scale: 1
   start_on_create: true