Fixes

block_federation.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CONTAINER_TO_REMOVE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp2.1)
+CONTAINER_TO_REMOVE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+xmpp2.1)
 CONTAINER_NAME=pumba_node2
 
 echo "About to be blocked from communication: $CONTAINER_TO_REMOVE"

block_node_from_cluster.sh

@@ -4,7 +4,7 @@
 #Example usage: `./remove_node_from_cluster.sh 1` to remove node xmpp1
 
 NODE=$1
-CONTAINER_TO_REMOVE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp"$NODE".1)
+CONTAINER_TO_REMOVE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+xmpp"$NODE".1)
 CONTAINER_NAME=pumba_node"$NODE"
 
 echo "About to be removed from cluster: $CONTAINER_TO_REMOVE"

cluster/start.sh

@@ -10,6 +10,9 @@ COMPOSE_FILE_COMMAND=("docker-compose")
 COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env")
 COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT")
 
+# Where is this script? It could be called from anywhere, so use this to get full paths.
+SCRIPTPATH="$( cd "$(dirname "$0")"; pwd -P )"
+
 while getopts n:h o; do
   case "$o" in
     n)
@@ -32,15 +35,18 @@ done
 echo "Starting a clustered environment."
 COMPOSE_FILE_COMMAND+=("-f" "docker-compose-clustered.yml")
 
+pushd "$SCRIPTPATH"
+
 "${COMPOSE_FILE_COMMAND[@]}" down
 "${COMPOSE_FILE_COMMAND[@]}" pull --ignore-pull-failures
 
 # Clean up temporary persistence data
 if ! rm -rf _data; then 
-  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && exit 1
+  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && popd && exit 1
 fi
 mkdir _data
 cp -r xmpp _data/
 cp -r plugins _data/
 
-"${COMPOSE_FILE_COMMAND[@]}" up -d
+"${COMPOSE_FILE_COMMAND[@]}" up -d || popd
+popd

cluster_with_federation/start.sh

@@ -10,6 +10,9 @@ COMPOSE_FILE_COMMAND=("docker-compose")
 COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env")
 COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT")
 
+# Where is this script? It could be called from anywhere, so use this to get full paths.
+SCRIPTPATH="$( cd "$(dirname "$0")"; pwd -P )"
+
 while getopts n:h o; do
   case "$o" in
     n)
@@ -32,15 +35,18 @@ done
 echo "Starting a clustered environment."
 COMPOSE_FILE_COMMAND+=("-f" "docker-compose-clustered.yml")
 
+pushd "$SCRIPTPATH"
+
 "${COMPOSE_FILE_COMMAND[@]}" down
 "${COMPOSE_FILE_COMMAND[@]}" pull --ignore-pull-failures
 
 # Clean up temporary persistence data
 if ! rm -rf _data; then 
-  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && exit 1
+  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && popd && exit 1
 fi
 mkdir _data
 cp -r xmpp _data/
 cp -r plugins _data/
 
-"${COMPOSE_FILE_COMMAND[@]}" up -d
+"${COMPOSE_FILE_COMMAND[@]}" up -d || popd
+popd

federation/start.sh

@@ -10,6 +10,9 @@ COMPOSE_FILE_COMMAND=("docker-compose")
 COMPOSE_FILE_COMMAND+=("--env-file" "../_common/.env")
 COMPOSE_FILE_COMMAND+=("--project-name" "$PROJECT")
 
+# Where is this script? It could be called from anywhere, so use this to get full paths.
+SCRIPTPATH="$( cd "$(dirname "$0")"; pwd -P )"
+
 while getopts n:h o; do
   case "$o" in
     n)
@@ -32,15 +35,18 @@ done
 echo "Starting a federated environment."
 COMPOSE_FILE_COMMAND+=("-f" "docker-compose-federated.yml")
 
+pushd "$SCRIPTPATH"
+
 "${COMPOSE_FILE_COMMAND[@]}" down
 "${COMPOSE_FILE_COMMAND[@]}" pull --ignore-pull-failures
 
 # Clean up temporary persistence data
 if ! rm -rf _data; then 
-  echo "ERROR: Failed to delete _data directory. Try with sudo, then re-run." && exit 1
+  echo "ERROR: Failed to delete the data directory. Try with sudo, then re-run." && popd && exit 1
 fi
 mkdir _data
 cp -r xmpp _data/
 cp -r plugins _data/
 
-"${COMPOSE_FILE_COMMAND[@]}" up -d
+"${COMPOSE_FILE_COMMAND[@]}" up -d || popd
+popd

scripts/get_logs.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-CONTAINER_ONE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp1.1)
+CONTAINER_ONE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+xmpp1.1)
-CONTAINER_TWO=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp2.1)
+CONTAINER_TWO=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+xmpp2.1)
-CONTAINER_THREE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp3.1)
+CONTAINER_THREE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+xmpp3.1)
-CONTAINER_OTHER=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+otherxmpp.1)
+CONTAINER_OTHER=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+otherxmpp.1)
 
 [ -n "$CONTAINER_ONE" ] && docker exec -t "$CONTAINER_ONE" cat /usr/local/openfire/logs/openfire.log > 1-openfire.log
 [ -n "$CONTAINER_TWO" ] && docker exec -t "$CONTAINER_TWO" cat /usr/local/openfire/logs/openfire.log > 2-openfire.log

scripts/peek_at_database.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 # Get a dump of the Openfire database in db_1 to peek at
-CONTAINER_NAME=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+db.1)
+docker ps --filter status=running --format "{{.Names}}" | grep -E openfire.+db | \
-docker exec -t "$CONTAINER_NAME" pg_dump -U openfire openfire > peek.sql
+  awk '{ system("docker exec -t "$1" pg_dump -U openfire openfire > peek_"$1".sql") }'