diff --git a/templates/zammad/1/docker-compose.yml b/templates/zammad/1/docker-compose.yml deleted file mode 100644 index 6114f2d..0000000 --- a/templates/zammad/1/docker-compose.yml +++ /dev/null @@ -1,81 +0,0 @@ -version: '2' - -services: - - zammad: - depends_on: - - zammad-elasticsearch - - zammad-postgresql - image: zammad/zammad-docker-compose:zammad - labels: - io.rancher.container.pull_image: always - io.rancher.container.start_once: 'true' - restart: on-failure - volumes: - - data-zammad:/home/zammad - - zammad-elasticsearch: - image: zammad/zammad-docker-compose:zammad-elasticsearch - labels: - io.rancher.container.pull_image: always - restart: always - - zammad-nginx: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-nginx - labels: - io.rancher.container.pull_image: always - links: - - zammad-railsserver - - zammad-websocket - ports: - - "80:80" - restart: always - volumes: - - data-zammad:/home/zammad - - zammad-postgresql: - image: zammad/zammad-docker-compose:zammad-postgresql - labels: - io.rancher.container.pull_image: always - restart: always - - zammad-railsserver: - image: zammad/zammad-docker-compose:zammad-railsserver - labels: - io.rancher.container.pull_image: always - links: - - zammad-elasticsearch - - zammad-postgresql - - zammad - depends_on: - - zammad - restart: always - - zammad-scheduler: - image: zammad/zammad-docker-compose:zammad-scheduler - labels: - io.rancher.container.pull_image: always - links: - - zammad-elasticsearch - - zammad-postgresql - - zammad - depends_on: - - zammad-railsserver - restart: always - - zammad-websocket: - image: zammad/zammad-docker-compose:zammad-websocket - labels: - io.rancher.container.pull_image: always - links: - - zammad-postgresql - - zammad - depends_on: - - zammad-railsserver - restart: always - -volumes: - data-zammad: - driver: local diff --git a/templates/zammad/3/docker-compose.yml.tpl b/templates/zammad/1/docker-compose.yml.tpl similarity index 100% rename from templates/zammad/3/docker-compose.yml.tpl rename to templates/zammad/1/docker-compose.yml.tpl diff --git a/templates/zammad/1/rancher-compose.yml b/templates/zammad/1/rancher-compose.yml index f69b61b..9cd075b 100644 --- a/templates/zammad/1/rancher-compose.yml +++ b/templates/zammad/1/rancher-compose.yml @@ -1,12 +1,25 @@ -.catalog: +version: '2' +catalog: name: "Zammad" - version: "1.3" + version: "2.2.0-12" description: "Zammad is a web based open source helpdesk/customer support system" uuid: zammad-1 minimum_rancher_version: v1.2.0 questions: + - variable: "UPDATE_SYSCTL" + label: "Update host sysctl:" + description: | + Set true to avoid vm.max_map_count errors. + WARN: If set true, host param vm.max_map_count will be update to 262144. + default: false + required: true + type: enum + options: + - false + - true - zammad: +services: + zammad-backup: scale: 1 start_on_create: true @@ -14,6 +27,14 @@ scale: 1 start_on_create: true + zammad-init: + scale: 1 + start_on_create: true + + zammad-memcached: + scale: 1 + start_on_create: true + zammad-nginx: scale: 1 start_on_create: true @@ -33,3 +54,18 @@ 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 diff --git a/templates/zammad/2/docker-compose.yml b/templates/zammad/2/docker-compose.yml deleted file mode 100644 index e9eb953..0000000 --- a/templates/zammad/2/docker-compose.yml +++ /dev/null @@ -1,106 +0,0 @@ -version: '2' - -services: - - zammad: - depends_on: - - zammad-elasticsearch - - zammad-postgresql - image: zammad/zammad-docker-compose:zammad - labels: - io.rancher.container.pull_image: always - io.rancher.container.start_once: 'true' - restart: on-failure - volumes: - - data-zammad:/home/zammad - - zammad-backup: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-backup - labels: - io.rancher.container.pull_image: always - links: - - zammad-postgresql - restart: always - volumes: - - data-zammad:/home/zammad - - backup-zammad:/var/tmp/zammad - - zammad-elasticsearch: - image: zammad/zammad-docker-compose:zammad-elasticsearch - labels: - io.rancher.container.pull_image: always - restart: always - volumes: - - data-elasticsearch:/usr/share/elasticsearch/data - - zammad-nginx: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-nginx - labels: - io.rancher.container.pull_image: always - links: - - zammad-railsserver - - zammad-websocket - ports: - - "80:80" - restart: always - volumes: - - data-zammad:/home/zammad - - zammad-postgresql: - image: zammad/zammad-docker-compose:zammad-postgresql - labels: - io.rancher.container.pull_image: always - restart: always - - zammad-railsserver: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-railsserver - labels: - io.rancher.container.pull_image: always - links: - - zammad-elasticsearch - - zammad-postgresql - depends_on: - - zammad - restart: always - volumes: - - data-zammad:/home/zammad - - zammad-scheduler: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-scheduler - labels: - io.rancher.container.pull_image: always - links: - - zammad-elasticsearch - - zammad-postgresql - restart: always - volumes: - - data-zammad:/home/zammad - - zammad-websocket: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-websocket - labels: - io.rancher.container.pull_image: always - links: - - zammad-postgresql - - zammad - restart: always - volumes: - - data-zammad:/home/zammad - -volumes: - backup-zammad: - driver: local - data-zammad: - driver: local - data-elasticsearch: - driver: local diff --git a/templates/zammad/2/rancher-compose.yml b/templates/zammad/2/rancher-compose.yml deleted file mode 100644 index dcca4eb..0000000 --- a/templates/zammad/2/rancher-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -.catalog: - name: "Zammad" - version: "1.4" - description: "Zammad is a web based open source helpdesk/customer support system" - uuid: zammad-1 - minimum_rancher_version: v1.2.0 - questions: - - zammad: - scale: 1 - start_on_create: true - - zammad-backup: - scale: 1 - start_on_create: true - - zammad-elasticsearch: - scale: 1 - start_on_create: true - - zammad-nginx: - scale: 1 - start_on_create: true - - zammad-postgresql: - scale: 1 - start_on_create: true - - zammad-scheduler: - scale: 1 - start_on_create: true - - zammad-railsserver: - scale: 1 - start_on_create: true - - zammad-websocket: - scale: 1 - start_on_create: true diff --git a/templates/zammad/3/rancher-compose.yml b/templates/zammad/3/rancher-compose.yml deleted file mode 100644 index 9cd075b..0000000 --- a/templates/zammad/3/rancher-compose.yml +++ /dev/null @@ -1,71 +0,0 @@ -version: '2' -catalog: - name: "Zammad" - version: "2.2.0-12" - description: "Zammad is a web based open source helpdesk/customer support system" - uuid: zammad-1 - minimum_rancher_version: v1.2.0 - questions: - - variable: "UPDATE_SYSCTL" - label: "Update host sysctl:" - description: | - Set true to avoid vm.max_map_count errors. - WARN: If set true, host param vm.max_map_count will be update to 262144. - default: false - required: true - type: enum - options: - - false - - true - -services: - zammad-backup: - scale: 1 - start_on_create: true - - zammad-elasticsearch: - scale: 1 - start_on_create: true - - zammad-init: - scale: 1 - start_on_create: true - - zammad-memcached: - scale: 1 - start_on_create: true - - zammad-nginx: - scale: 1 - start_on_create: true - - zammad-postgresql: - scale: 1 - start_on_create: true - - zammad-scheduler: - scale: 1 - start_on_create: true - - zammad-railsserver: - scale: 1 - start_on_create: true - - 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