From 096dc20a641828a2c1a2c77adb1ae2f4d732d42a Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 17 May 2025 17:51:02 +1200 Subject: [PATCH] Clean up --- caddy/backup.sh | 4 ++-- caddy/install.sh | 4 ++-- caddy/logs.sh | 2 +- caddy/nuke.sh | 8 +++----- caddy/ports.sh | 2 +- caddy/restore.sh | 8 ++++---- caddy/start.sh | 2 +- caddy/status.sh | 2 +- caddy/stop.sh | 2 +- caddy/uninstall.sh | 2 +- example-nginx/backup.sh | 4 ++-- example-nginx/install.sh | 4 ++-- example-nginx/logs.sh | 2 +- example-nginx/nuke.sh | 4 ++-- example-nginx/ports.sh | 2 +- example-nginx/restore.sh | 4 ++-- example-nginx/start.sh | 2 +- example-nginx/status.sh | 2 +- example-nginx/stop.sh | 2 +- example-nginx/uninstall.sh | 2 +- simple-object-storage/backup.sh | 4 ++-- simple-object-storage/install.sh | 4 ++-- simple-object-storage/logs.sh | 2 +- simple-object-storage/nuke.sh | 5 +++-- simple-object-storage/ports.sh | 2 +- simple-object-storage/restore.sh | 4 ++-- simple-object-storage/ssh.sh | 2 +- simple-object-storage/start.sh | 2 +- simple-object-storage/status.sh | 2 +- simple-object-storage/stop.sh | 2 +- simple-object-storage/uninstall.sh | 2 +- squashkiwi/backup.sh | 4 ++-- squashkiwi/install.sh | 4 ++-- squashkiwi/logs.sh | 2 +- squashkiwi/nuke.sh | 6 ++++-- squashkiwi/ports.sh | 2 +- squashkiwi/restore.sh | 4 ++-- squashkiwi/ssh.sh | 2 +- squashkiwi/start.sh | 2 +- squashkiwi/status.sh | 2 +- squashkiwi/stop.sh | 2 +- squashkiwi/uninstall.sh | 2 +- watchtower/install.sh | 2 +- watchtower/logs.sh | 2 +- watchtower/start.sh | 2 +- watchtower/status.sh | 2 +- watchtower/stop.sh | 2 +- watchtower/uninstall.sh | 2 +- 48 files changed, 70 insertions(+), 69 deletions(-) diff --git a/caddy/backup.sh b/caddy/backup.sh index 810b024..1c3027c 100755 --- a/caddy/backup.sh +++ b/caddy/backup.sh @@ -1,10 +1,10 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars _stop_container "$CONTAINER_NAME" -autobackup "$1" "$2" "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to create backup" +databackup "$1" "$2" "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to create backup" _start_container "$CONTAINER_NAME" diff --git a/caddy/install.sh b/caddy/install.sh index 1ad9eba..8b3cbb8 100755 --- a/caddy/install.sh +++ b/caddy/install.sh @@ -1,8 +1,8 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_VOLUME" "CONFIG_VOLUME" "CONFIG_PATH" -autocreate "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to autocreate volumes $DATA_VOLUME and $CONFIG_VOLUME" +datacreate "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to create volumes $DATA_VOLUME and $CONFIG_VOLUME" _check_docker_installed || _die "Docker test failed, aborting installation..." diff --git a/caddy/logs.sh b/caddy/logs.sh index c1b820f..1f66acf 100755 --- a/caddy/logs.sh +++ b/caddy/logs.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Main script. diff --git a/caddy/nuke.sh b/caddy/nuke.sh index 5495b27..874c8d1 100755 --- a/caddy/nuke.sh +++ b/caddy/nuke.sh @@ -1,13 +1,11 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # NUKE SCRIPT -# This is run after the uninstall.sh script to delete all data. -# dropshell handles the configuration files, so we just need to remove -# any docker volumes and any custom local data folders. +./uninstall.sh -autonuke "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to nuke" +datanuke "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to nuke" echo "Nuking of ${CONTAINER_NAME} complete." diff --git a/caddy/ports.sh b/caddy/ports.sh index aa08d2d..b2a319b 100755 --- a/caddy/ports.sh +++ b/caddy/ports.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" echo 80 diff --git a/caddy/restore.sh b/caddy/restore.sh index e5c7993..ffa3f09 100755 --- a/caddy/restore.sh +++ b/caddy/restore.sh @@ -1,17 +1,17 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # RESTORE SCRIPT # uninstall container before restore -bash ./uninstall.sh || _die "Failed to uninstall service before restore" +./uninstall.sh || _die "Failed to uninstall service before restore" # restore data from backup file -autorestore "$1" "$2" "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to restore data from backup file" +datarestore "$1" "$2" "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to restore data from backup file" # reinstall service -bash ./install.sh || _die "Failed to reinstall service after restore" +./install.sh || _die "Failed to reinstall service after restore" echo "Restore complete! Service is running again." diff --git a/caddy/start.sh b/caddy/start.sh index 5f2ec6f..19b6664 100755 --- a/caddy/start.sh +++ b/caddy/start.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # START SCRIPT diff --git a/caddy/status.sh b/caddy/status.sh index 85d3e27..2946313 100755 --- a/caddy/status.sh +++ b/caddy/status.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # STATUS SCRIPT diff --git a/caddy/stop.sh b/caddy/stop.sh index 9b83cc5..fa26db2 100755 --- a/caddy/stop.sh +++ b/caddy/stop.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # STOP SCRIPT diff --git a/caddy/uninstall.sh b/caddy/uninstall.sh index 6163001..7f86e87 100755 --- a/caddy/uninstall.sh +++ b/caddy/uninstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # UNINSTALL SCRIPT diff --git a/example-nginx/backup.sh b/example-nginx/backup.sh index 5a97acd..3d41f3d 100755 --- a/example-nginx/backup.sh +++ b/example-nginx/backup.sh @@ -1,10 +1,10 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" "CONTAINER_NAME" # Nginx Example Backup Script # hot backup is fine for nginx website content. -autobackup "path=${LOCAL_DATA_FOLDER}" || _die "Failed to create backup" +databackup "path=${LOCAL_DATA_FOLDER}" || _die "Failed to create backup" echo "Backup complete for ${CONTAINER_NAME}" diff --git a/example-nginx/install.sh b/example-nginx/install.sh index d0270a9..1ed6961 100755 --- a/example-nginx/install.sh +++ b/example-nginx/install.sh @@ -1,11 +1,11 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "CONTAINER_NAME" # Nginx Example Install Script # Ensure local data folder exists -autocreate "path=${LOCAL_DATA_FOLDER}" +datacreate "path=${LOCAL_DATA_FOLDER}" echo "Checking Docker installation..." _check_docker_installed || _die "Docker test failed, aborting installation..." diff --git a/example-nginx/logs.sh b/example-nginx/logs.sh index 085f83a..37e10fe 100755 --- a/example-nginx/logs.sh +++ b/example-nginx/logs.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" # Nginx Example Logs Script diff --git a/example-nginx/nuke.sh b/example-nginx/nuke.sh index 09ae539..8160ff9 100755 --- a/example-nginx/nuke.sh +++ b/example-nginx/nuke.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "CONTAINER_NAME" # Nginx Example Nuke Script @@ -8,6 +8,6 @@ _check_required_env_vars "LOCAL_DATA_FOLDER" "CONTAINER_NAME" # Call uninstall script first ./uninstall.sh -autonuke "path=${LOCAL_DATA_FOLDER}" || _die "Failed to nuke ${LOCAL_DATA_FOLDER}" +datanuke "path=${LOCAL_DATA_FOLDER}" || _die "Failed to nuke ${LOCAL_DATA_FOLDER}" echo "Nuke complete for service ${CONTAINER_NAME}." diff --git a/example-nginx/ports.sh b/example-nginx/ports.sh index deb9747..6e07855 100755 --- a/example-nginx/ports.sh +++ b/example-nginx/ports.sh @@ -1,6 +1,6 @@ #!/bin/bash [ ! -z "$AGENT_PATH" ] || { echo "AGENT_PATH is not set"; exit 1; } -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "HOST_PORT" diff --git a/example-nginx/restore.sh b/example-nginx/restore.sh index 1f5a0c3..f1d4b9d 100755 --- a/example-nginx/restore.sh +++ b/example-nginx/restore.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" "CONTAINER_NAME" # Nginx Example Restore Script @@ -7,7 +7,7 @@ _check_required_env_vars "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" "CONTAINER echo "Uninstalling service before restore..." bash ./uninstall.sh || _die "Failed to uninstall service before restore" -autorestore "path=${LOCAL_DATA_FOLDER}" || _die "Failed to restore data folder from backup" +datarestore "path=${LOCAL_DATA_FOLDER}" || _die "Failed to restore data folder from backup" echo "Restore complete. Reinstalling service..." bash ./install.sh || _die "Failed to reinstall service after restore" diff --git a/example-nginx/start.sh b/example-nginx/start.sh index 40438ac..87beeb3 100755 --- a/example-nginx/start.sh +++ b/example-nginx/start.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" "HOST_PORT" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" # START SCRIPT diff --git a/example-nginx/status.sh b/example-nginx/status.sh index cadc8ef..3d729d5 100755 --- a/example-nginx/status.sh +++ b/example-nginx/status.sh @@ -1,6 +1,6 @@ #!/bin/bash [ ! -z "$AGENT_PATH" ] || { echo "AGENT_PATH is not set"; exit 1; } -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" # STATUS SCRIPT diff --git a/example-nginx/stop.sh b/example-nginx/stop.sh index f908886..173e424 100755 --- a/example-nginx/stop.sh +++ b/example-nginx/stop.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" _stop_container $CONTAINER_NAME || _die "Failed to stop container ${CONTAINER_NAME}" diff --git a/example-nginx/uninstall.sh b/example-nginx/uninstall.sh index 4507a0d..5391676 100755 --- a/example-nginx/uninstall.sh +++ b/example-nginx/uninstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" # Nginx Example Uninstall Script diff --git a/simple-object-storage/backup.sh b/simple-object-storage/backup.sh index 330afce..e3ed395 100755 --- a/simple-object-storage/backup.sh +++ b/simple-object-storage/backup.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "VOLUME_NAME" "BACKUP_FILE" "TEMP_DIR" # Simple Object Storage Backup Script @@ -8,6 +8,6 @@ _check_required_env_vars "VOLUME_NAME" "BACKUP_FILE" "TEMP_DIR" # HOT backup is fine for simple-object-storage -autobackup "volume=${VOLUME_NAME}" || _die "Failed to create backup" +databackup "volume=${VOLUME_NAME}" || _die "Failed to create backup" echo "Backup complete: ${BACKUP_FILE}" diff --git a/simple-object-storage/install.sh b/simple-object-storage/install.sh index f0fc364..2c7a9ef 100755 --- a/simple-object-storage/install.sh +++ b/simple-object-storage/install.sh @@ -1,11 +1,11 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Simple Object Storage Install Script # Pulls image, creates volume/config, starts container. -autocreate "volume=${VOLUME_NAME}" +datacreate "volume=${VOLUME_NAME}" # check can pull image on remote host and exit if fails echo "Pulling image ${IMAGE_REGISTRY}/${IMAGE_REPO}:${IMAGE_TAG}..." diff --git a/simple-object-storage/logs.sh b/simple-object-storage/logs.sh index 71945d6..2240a72 100755 --- a/simple-object-storage/logs.sh +++ b/simple-object-storage/logs.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Simple Object Storage Logs Script diff --git a/simple-object-storage/nuke.sh b/simple-object-storage/nuke.sh index 9caebee..0d494d9 100755 --- a/simple-object-storage/nuke.sh +++ b/simple-object-storage/nuke.sh @@ -1,11 +1,12 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Simple Object Storage Nuke Script # Removes container AND volume. +./uninstall.sh -autonuke "volume=${VOLUME_NAME}" || _die "Failed to nuke volume ${VOLUME_NAME}" +datanuke "volume=${VOLUME_NAME}" || _die "Failed to nuke volume ${VOLUME_NAME}" echo "Nuke complete for service ${CONTAINER_NAME}." diff --git a/simple-object-storage/ports.sh b/simple-object-storage/ports.sh index b3dbbc2..61e16d9 100755 --- a/simple-object-storage/ports.sh +++ b/simple-object-storage/ports.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONFIG_PATH" # PORT SCRIPT diff --git a/simple-object-storage/restore.sh b/simple-object-storage/restore.sh index 4cf61e4..3608f4e 100755 --- a/simple-object-storage/restore.sh +++ b/simple-object-storage/restore.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" || _die "Failed to source _common.sh" +source "${AGENT_PATH}/common.sh" || _die "Failed to source common.sh" _check_required_env_vars "BACKUP_FILE" "TEMP_DIR" "VOLUME_NAME" "CONTAINER_NAME" # Simple Object Storage Restore Script @@ -12,7 +12,7 @@ bash ./uninstall.sh || _die "Failed to uninstall service before restore" echo "Restoring data for ${CONTAINER_NAME} from ${BACKUP_FILE}..." -autorestore "volume=${VOLUME_NAME}" || _die "Failed to restore data from backup file" +datarestore "volume=${VOLUME_NAME}" || _die "Failed to restore data from backup file" echo "Restore complete. Reinstalling service..." diff --git a/simple-object-storage/ssh.sh b/simple-object-storage/ssh.sh index b99e9cb..6bebc11 100755 --- a/simple-object-storage/ssh.sh +++ b/simple-object-storage/ssh.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Simple Object Storage SSH Script diff --git a/simple-object-storage/start.sh b/simple-object-storage/start.sh index fc3b8f6..d6fec69 100755 --- a/simple-object-storage/start.sh +++ b/simple-object-storage/start.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "VOLUME_NAME" "CONFIG_PATH" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" # Simple Object Storage Start Script diff --git a/simple-object-storage/status.sh b/simple-object-storage/status.sh index 26e96c5..96b2c61 100755 --- a/simple-object-storage/status.sh +++ b/simple-object-storage/status.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # STATUS SCRIPT diff --git a/simple-object-storage/stop.sh b/simple-object-storage/stop.sh index 98b8169..aebd5d8 100755 --- a/simple-object-storage/stop.sh +++ b/simple-object-storage/stop.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Simple Object Storage Stop Script diff --git a/simple-object-storage/uninstall.sh b/simple-object-storage/uninstall.sh index 31fad56..8237fec 100755 --- a/simple-object-storage/uninstall.sh +++ b/simple-object-storage/uninstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # UNINSTALL SCRIPT diff --git a/squashkiwi/backup.sh b/squashkiwi/backup.sh index cede869..d276ea2 100755 --- a/squashkiwi/backup.sh +++ b/squashkiwi/backup.sh @@ -1,11 +1,11 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" # Stop container before backup _stop_container "$CONTAINER_NAME" -autobackup "path=${LOCAL_DATA_FOLDER}" || _die "Failed to create backup" +databackup "path=${LOCAL_DATA_FOLDER}" || _die "Failed to create backup" # Start container after backup _start_container "$CONTAINER_NAME" diff --git a/squashkiwi/install.sh b/squashkiwi/install.sh index 561148b..54c7fe3 100755 --- a/squashkiwi/install.sh +++ b/squashkiwi/install.sh @@ -1,8 +1,8 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "CONTAINER_NAME" "LOCAL_DATA_FOLDER" -autocreate path=$LOCAL_DATA_FOLDER || _die "Failed to create local data folder" +datacreate path=$LOCAL_DATA_FOLDER || _die "Failed to create local data folder" # Test Docker _check_docker_installed || _die "Docker test failed, aborting installation..." diff --git a/squashkiwi/logs.sh b/squashkiwi/logs.sh index 2efa469..5adf520 100755 --- a/squashkiwi/logs.sh +++ b/squashkiwi/logs.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" echo "Container ${CONTAINER_NAME} logs:" diff --git a/squashkiwi/nuke.sh b/squashkiwi/nuke.sh index d3e4cc0..ea77805 100755 --- a/squashkiwi/nuke.sh +++ b/squashkiwi/nuke.sh @@ -1,8 +1,10 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" -autonuke "path=${LOCAL_DATA_FOLDER}" || _die "Failed to nuke ${LOCAL_DATA_FOLDER}" +./uninstall.sh + +datanuke "path=${LOCAL_DATA_FOLDER}" || _die "Failed to nuke ${LOCAL_DATA_FOLDER}" echo "Nuke of ${CONTAINER_NAME} complete" diff --git a/squashkiwi/ports.sh b/squashkiwi/ports.sh index 8178ba0..721e392 100755 --- a/squashkiwi/ports.sh +++ b/squashkiwi/ports.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "HOST_PORT" echo $HOST_PORT diff --git a/squashkiwi/restore.sh b/squashkiwi/restore.sh index 5d59bf9..2ec38ea 100755 --- a/squashkiwi/restore.sh +++ b/squashkiwi/restore.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" # RESTORE SCRIPT @@ -10,7 +10,7 @@ _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEM # # Stop container before backup bash ./uninstall.sh || _die "Failed to uninstall service before restore" -autorestore "path=${LOCAL_DATA_FOLDER}" || _die "Failed to restore data folder from backup" +datarestore "path=${LOCAL_DATA_FOLDER}" || _die "Failed to restore data folder from backup" # reinstall service bash ./install.sh || _die "Failed to reinstall service after restore" diff --git a/squashkiwi/ssh.sh b/squashkiwi/ssh.sh index 3357154..58b6eb8 100755 --- a/squashkiwi/ssh.sh +++ b/squashkiwi/ssh.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" if ! _is_container_running "$CONTAINER_NAME"; then diff --git a/squashkiwi/start.sh b/squashkiwi/start.sh index 54a6bac..1240813 100755 --- a/squashkiwi/start.sh +++ b/squashkiwi/start.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "HOST_PORT" "CONTAINER_PORT" "LOCAL_DATA_FOLDER" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" diff --git a/squashkiwi/status.sh b/squashkiwi/status.sh index d02d18f..1170190 100755 --- a/squashkiwi/status.sh +++ b/squashkiwi/status.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "HOST_PORT" # check if the service is running diff --git a/squashkiwi/stop.sh b/squashkiwi/stop.sh index f908886..173e424 100755 --- a/squashkiwi/stop.sh +++ b/squashkiwi/stop.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" _stop_container $CONTAINER_NAME || _die "Failed to stop container ${CONTAINER_NAME}" diff --git a/squashkiwi/uninstall.sh b/squashkiwi/uninstall.sh index f324a25..253a744 100755 --- a/squashkiwi/uninstall.sh +++ b/squashkiwi/uninstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" # UNINSTALL SCRIPT diff --git a/watchtower/install.sh b/watchtower/install.sh index cca77cb..d0c04ae 100755 --- a/watchtower/install.sh +++ b/watchtower/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" # Watchtower Install Script diff --git a/watchtower/logs.sh b/watchtower/logs.sh index cb35945..cd770e2 100755 --- a/watchtower/logs.sh +++ b/watchtower/logs.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" # Watchtower Logs Script diff --git a/watchtower/start.sh b/watchtower/start.sh index 89cf7ca..7fa3ca6 100755 --- a/watchtower/start.sh +++ b/watchtower/start.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Watchtower Start Script diff --git a/watchtower/status.sh b/watchtower/status.sh index d389f10..fe297cb 100755 --- a/watchtower/status.sh +++ b/watchtower/status.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars "CONTAINER_NAME" # Watchtower Status Script diff --git a/watchtower/stop.sh b/watchtower/stop.sh index 7f336ad..13df63b 100755 --- a/watchtower/stop.sh +++ b/watchtower/stop.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Watchtower Stop Script diff --git a/watchtower/uninstall.sh b/watchtower/uninstall.sh index cb839c2..0d50a3c 100755 --- a/watchtower/uninstall.sh +++ b/watchtower/uninstall.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${AGENT_PATH}/_common.sh" +source "${AGENT_PATH}/common.sh" _check_required_env_vars # Watchtower Uninstall Script