From 57200f0fb312ee5c17cd6bbdc668db56d3aa0c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 7 Dec 2020 12:22:03 +0100 Subject: [PATCH] testing lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- .github/ISSUE_TEMPLATE.md | 8 ++++---- README.md | 3 +-- containers/zammad/docker-entrypoint.sh | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d8afd17..72c7cc1 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,20 +8,20 @@ Hi there - thanks for filling an issue. Please ensure the following things befor * The upper textblock will be removed automatically when you submit your issue * --> -### Infos +# Infos * Docker version: * Docker-compose version: * Operating system (Docker host): -### Expected behavior +# Expected behavior * -### Actual behavior +# Actual behavior * -### Steps to reproduce the behavior +# Steps to reproduce the behavior * diff --git a/README.md b/README.md index 31074e6..c238a33 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,7 @@ RANCHER_URL=http://RANCHER_HOST:8080 rancher-compose --env-file=.env up ## Running without Elasticsearch -Elasticsearch is an optional, but strongly recommended dependency for Zammad. -More details can be found in the [documentation](https://docs.zammad.org/en/latest/prerequisites/software.html#elasticsearch-optional). There are however certain scenarios when running without Elasticsearch may be desired, e.g. for very small teams, for teams with limited budget or as a temporary solution for an unplanned Elasticsearch downtime or planned cluster upgrade. +Elasticsearch is an optional, but strongly recommended dependency for Zammad. More details can be found in the [documentation](https://docs.zammad.org/en/latest/prerequisites/software.html#elasticsearch-optional). There are however certain scenarios when running without Elasticsearch may be desired, e.g. for very small teams, for teams with limited budget or as a temporary solution for an unplanned Elasticsearch downtime or planned cluster upgrade. Elasticsearch is enabled by default in the example `docker-compose.yml` file. It is also by default required to run the "zammad-init" command. Disabling Elasticsearch is possible by setting a special environment variable: `ELASTICSEARCH_ENABLED=false` for the `zammad-init` container and removing all references to Elasticsearch everywhere else: the `zammad-elasticsearch` container, it's volume and links to it. diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 355fa76..1c58e16 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -103,7 +103,7 @@ if [ "$1" = 'zammad-init' ]; then fi if [ "${ELASTICSEARCH_REINDEX}" == "true" ]; then - if ! curl -s ${SSL_SKIP_VERIFY} ${ELASTICSEARCH_SCHEMA}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices | grep -q zammad; then + if ! curl -s "${SSL_SKIP_VERIFY}" "${ELASTICSEARCH_SCHEMA}://${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices" | grep -q zammad; then echo "rebuilding es searchindex..." bundle exec rake searchindex:rebuild fi