Merge branch 'master' into 2.3.1

Author: andmarios

setup-and-run.sh

@@ -16,6 +16,25 @@ if [[ $STRICT_SCRIPT =~ $TRUE_REG ]]; then
     set -o pipefail
 fi
 
+# Run pre-setup user provided scripts.
+export PRE_SETUP=${PRE_SETUP:-}
+export PRE_SETUP_FILE=${PRE_SETUP_FILE:-}
+export PRE_SETUP_URL=${PRE_SETUP_URL:-}
+if [[ -n "$PRE_SETUP" ]]; then
+    $PRE_SETUP
+fi
+if [[ -n "$PRE_SETUP_FILE" ]]; then
+    if [[ ! -f "$PRE_SETUP_FILE" ]]; then
+        echo "Although PRE_SETUP_FILE is set, I cannot find the file."
+    fi
+    source $PRE_SETUP_FILE
+fi
+if [[ -n "$PRE_SETUP_URL" ]]; then
+    curl "$PRE_SETUP_URL" --silent --show-error --fail --output /tmp/PRE_SETUP_URL
+    source /tmp/PRE_SETUP_URL
+    rm /tmp/PRE_SETUP_URL
+fi
+
 # Default values
 export ZK_PORT=${ZK_PORT:-2181}
 export ZK_JMX_PORT=${ZK_JMX_PORT:-9585}
@@ -538,4 +557,23 @@ else
     export FORWARDLOGS=0
 fi
 
+# Run post-setup user provided scripts.
+export POST_SETUP=${POST_SETUP:-}
+export POST_SETUP_FILE=${POST_SETUP_FILE:-}
+export POST_SETUP_URL=${POST_SETUP_URL:-}
+if [[ -n "$POST_SETUP" ]]; then
+    $POST_SETUP
+fi
+if [[ -n "$POST_SETUP_FILE" ]]; then
+    if [[ ! -f "$POST_SETUP_FILE" ]]; then
+        echo "Although POST_SETUP_FILE is set, I cannot find the file."
+    fi
+    source $POST_SETUP_FILE
+fi
+if [[ -n "$POST_SETUP_URL" ]]; then
+    curl "$POST_SETUP_URL" --silent --show-error --fail --output /tmp/POST_SETUP_URL
+    source /tmp/POST_SETUP_URL
+    rm /tmp/POST_SETUP_URL
+fi
+
 exec /usr/bin/supervisord -c /etc/supervisord.conf