testing lint

Signed-off-by: André Bauer <monotek23@gmail.com>
This commit is contained in:
André Bauer 2020-12-07 12:22:03 +01:00
parent e4c6787319
commit 57200f0fb3
3 changed files with 6 additions and 7 deletions

View File

@ -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
*

View File

@ -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.

View File

@ -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