Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/zammad/zammad into develop

Browse source
This commit is contained in:
Thorsten Eckel 2018-12-13 16:18:46 +01:00
commit fb612f34d1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/packager.io/functions
View file

@ -248,7 +248,7 @@ function setup_elasticsearch () {
yes | /usr/share/elasticsearch/bin/elasticsearch-plugin -s install ingest-attachment yes | /usr/share/elasticsearch/bin/elasticsearch-plugin -s install ingest-attachment
if [ "${ES_CONNECTION}" == "http://127.0.0.1:9200" ]; then if [ "${ES_CONNECTION}" == "http://127.0.0.1:9200" ] || [ "${ES_CONNECTION}" == "http://localhost:9200" ]; then
${INIT_CMD} restart elasticsearch ${INIT_CMD} restart elasticsearch
else else
echo -e "\n It seems you're running an external Elasticsearch server on ${ES_CONNECTION}" echo -e "\n It seems you're running an external Elasticsearch server on ${ES_CONNECTION}"