- removed double declaration of nginx services

- added nginx health check
- fixed labels

templates/zammad/1/docker-compose.yml.tpl

@@ -17,8 +17,10 @@ services:
 
   zammad-elasticsearch:
     image: zammad/zammad-docker-compose:zammad-elasticsearch-2.2.0-12
+    {{- if eq .Values.UPDATE_SYSCTL "true" }}
     labels:
-      io.rancher.sidekicks: {{- if eq .Values.UPDATE_SYSCTL "true" -}}zammad-es-sysctl{{- end}}
+      io.rancher.sidekicks: zammad-es-sysctl
+    {{- end}}
     restart: always
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
@@ -114,13 +116,9 @@ services:
   {{- end}}
 
   zammad-lb:
-    image: rancher/lb-service-haproxy:v0.7.15
+    image: rancher/lb-service-haproxy:v0.7.9
     ports:
-      - 9797:9797/tcp
+      - ${PUBLISH_PORT}:${PUBLISH_PORT}/tcp
-    labels:
-      io.rancher.container.agent.role: environmentAdmin,agent
-      io.rancher.container.agent_service.drain_provider: 'true'
-      io.rancher.container.create_agent: 'true'
 
 volumes:
   elasticsearch-data:

templates/zammad/1/rancher-compose.yml

@@ -18,6 +18,14 @@ catalog:
         - false
         - true
 
+    - variable: "PUBLISH_PORT"
+    label: "Publish port"
+    description: |
+      Set port to publish the service.
+    required: true
+    type: "int"
+    default: 9797
+
 services:
   zammad-backup:
     scale: 1
@@ -31,6 +39,16 @@ services:
     scale: 1
     start_on_create: true
 
+  zammad-lb:
+    scale: 1
+    lb_config:
+      port_rules:
+      - priority: 1
+        protocol: http
+        source_port: ${PUBLISH_PORT}
+        target_port: 80
+        service: zammad-nginx
+
   zammad-memcached:
     scale: 1
     start_on_create: true
@@ -38,6 +56,15 @@ services:
   zammad-nginx:
     scale: 1
     start_on_create: true
+    health_check:
+      healthy_threshold: 2
+      response_timeout: 2000
+      port: 80
+      unhealthy_threshold: 3
+      initializing_timeout: 300000
+      interval: 2000
+      strategy: recreate
+      request_line: GET "/" "HTTP/1.0"
 
   zammad-postgresql:
     scale: 1
@@ -54,18 +81,3 @@ services:
   zammad-websocket:
     scale: 1
     start_on_create: true
-
-  zammad-nginx:
-    scale: 1
-    start_on_create: true
-    drain_timeout_ms: 10000
-
-  zammad-lb:
-    scale: 1
-    lb_config:
-      port_rules:
-      - priority: 1
-        protocol: http
-        source_port: 9797
-        target_port: 80
-        service: zammad-nginx