amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-09-29 17:10:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:itzg/dockerfiles

Browse Source
This commit is contained in:
Geoff Bourne
2016-11-13 14:59:47 -06:00
parent 3bf560bfbe f1b58323d3
commit de6d7a64ac
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/start
+11 -11
View File
@@ -30,26 +30,26 @@ setup_clustering() {
fi fi
fi fi
fi fi
if [ -n "$NODE_NAME" ]; then if [ -n "$NODE_NAME" ]; then
OPTS="$OPTS -E node.name=$NODE_NAME" OPTS="$OPTS -E node.name=$NODE_NAME"
fi fi
if [ -n "$MULTICAST" ]; then if [ -n "$MULTICAST" ]; then
OPTS="$OPTS -E discovery.zen.ping.multicast.enabled=$MULTICAST" OPTS="$OPTS -E discovery.zen.ping.multicast.enabled=$MULTICAST"
fi fi
if [ -n "$UNICAST_HOSTS" ]; then if [ -n "$UNICAST_HOSTS" ]; then
OPTS="$OPTS -E discovery.zen.ping.unicast.hosts=$UNICAST_HOSTS" OPTS="$OPTS -E discovery.zen.ping.unicast.hosts=$UNICAST_HOSTS"
fi fi
if [ -n "$PUBLISH_AS" ]; then if [ -n "$PUBLISH_AS" ]; then
OPTS="$OPTS -E transport.publish_host=$(echo $PUBLISH_AS | awk -F: '{print $1}')" OPTS="$OPTS -E transport.publish_host=$(echo $PUBLISH_AS | awk -F: '{print $1}')"
OPTS="$OPTS -E transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')" OPTS="$OPTS -E transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')"
fi fi
if [ -n "$MIN_MASTERS" ]; then if [ -n "$MIN_MASTERS" ]; then
OPTS="$OPTS --discovery.zen.minimum_master_nodes=$MIN_MASTERS" OPTS="$OPTS -E discovery.zen.minimum_master_nodes=$MIN_MASTERS"
fi fi
} }
@@ -72,17 +72,17 @@ setup_personality() {
if [ -n "$TYPE" ]; then if [ -n "$TYPE" ]; then
case $TYPE in case $TYPE in
MASTER) MASTER)
OPTS="$OPTS --node.master=true --node.data=false" OPTS="$OPTS -E node.master=true -E node.data=false"
;; ;;
GATEWAY) GATEWAY)
OPTS="$OPTS --node.master=false --node.data=false" OPTS="$OPTS -E node.master=false -E node.data=false"
;; ;;
DATA|NON_MASTER) DATA|NON_MASTER)
OPTS="$OPTS --node.master=false --node.data=true" OPTS="$OPTS -E node.master=false -E node.data=true"
;; ;;
*) *)
echo "Unknown node type. Please use MASTER|GATEWAY|DATA|NON_MASTER" echo "Unknown node type. Please use MASTER|GATEWAY|DATA|NON_MASTER"
exit 1 exit 1