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

Fixes #2400 - Local Elasticsearch is recognized as remote installation.

Browse source
This commit is contained in:
Marcel Herrguth 2019-11-27 10:23:05 +01:00 committed by Thorsten Eckel
parent 8c27cbb05e
commit a9dd937968
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/packager.io/functions
View file

@ -228,10 +228,12 @@ function create_webserver_config () {
function setup_elasticsearch () { function setup_elasticsearch () {
echo "# Configuring Elasticsearch..." echo "# Configuring Elasticsearch..."
ES_CONNECTION="$(zammad run rails r "puts Setting.get('es_url')" 2>> /dev/null)" ES_CONNECTION="$(zammad run rails r "puts Setting.get('es_url')"| tail -n 1 2>> /dev/null)"
if [ -z "${ES_CONNECTION}" ]; then if [ -z "${ES_CONNECTION}" ]; then
ES_CONNECTION="http://127.0.0.1:9200" echo "-- Nevermind, no es_url is set, leaving Elasticsearch untouched ...!"
echo "-- The above is all right if you don't want to use Elasticsearch (locally) - if this is not intended, consult https://docs.zammad.org !"
return 0
fi fi
if [ -n "$(/usr/share/elasticsearch/bin/elasticsearch-plugin list | grep mapper-attachments)" ]; then if [ -n "$(/usr/share/elasticsearch/bin/elasticsearch-plugin list | grep mapper-attachments)" ]; then
@ -252,8 +254,7 @@ function setup_elasticsearch () {
${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}"
echo -e "Stopping local elasticsearch server..." echo -e "\n We'll not touch your Elasticsearch on the local and remote system."
${INIT_CMD} stop elasticsearch
echo -e "\n Please get sure to install the 'ingest-attachment' plugin on your Elasticsearch server by:" echo -e "\n Please get sure to install the 'ingest-attachment' plugin on your Elasticsearch server by:"
echo -e "/usr/share/elasticsearch/bin/elasticsearch-plugin -s install ingest-attachment" echo -e "/usr/share/elasticsearch/bin/elasticsearch-plugin -s install ingest-attachment"
echo -e "\nAfter this you might need to rebuild the searchindex by:" echo -e "\nAfter this you might need to rebuild the searchindex by:"