diff --git a/docker-observation b/docker-observation index 1283ec2..1ee44b7 160000 --- a/docker-observation +++ b/docker-observation @@ -1 +1 @@ -Subproject commit 1283ec2c84d911e64a0114b628afc758f62b2f3e +Subproject commit 1ee44b7b808c52eb4f8f56da210e38ac99f8dacd diff --git a/restic-scripts b/restic-scripts index 5b8221e..e17894e 160000 --- a/restic-scripts +++ b/restic-scripts @@ -1 +1 @@ -Subproject commit 5b8221ef77be7c3e0edfc4cedd4003c1640f9fa9 +Subproject commit e17894e49c7a3d25413710ae4a439d1c61f3d18e diff --git a/scripts/backup.sh b/scripts/backup.sh index 0fbab53..39a4832 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -21,4 +21,3 @@ python -m restic.backup --project zigbee-stack --services mqtt,z2m "$@" SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) -$SCRIPT_DIR/prune_backups.sh diff --git a/scripts/prune_backups.sh b/scripts/forget.sh similarity index 73% rename from scripts/prune_backups.sh rename to scripts/forget.sh index ddc4e26..6347c52 100755 --- a/scripts/prune_backups.sh +++ b/scripts/forget.sh @@ -5,6 +5,3 @@ python -m restic.forget \ --keep-weekly 8 \ --keep-monthly 12 \ --keep-yearly 7 -# --json | jq . - -python -m restic.prune \ No newline at end of file diff --git a/scripts/restic_backup.sh b/scripts/restic_backup.sh deleted file mode 100755 index 39f4f3e..0000000 --- a/scripts/restic_backup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) -REPO_DIR=$(dirname $SCRIPT_DIR) -COMPOSE_FILE=$REPO_DIR/docker-compose.yml - -SERVICES="mqtt z2m" - -echo -n "Stopping containers..." -docker compose -f $COMPOSE_FILE stop $SERVICES 2>/dev/null -echo "Done" - -echo -n "Running backup..." -$SCRIPT_DIR/restic_command.sh backup /data "$@" -echo "Done" - -echo -n "Executing compose up..." -docker compose -f $COMPOSE_FILE up -d 2>/dev/null -echo "Done" - -echo -n "Pruning restic repo..." -$SCRIPT_DIR/restic_prune.sh 1>/dev/null -echo "Done" - -SPACE=$(du -hs /mnt/* | awk '{print $1}') -echo "Total space used: $SPACE" diff --git a/scripts/restic_command.sh b/scripts/restic_command.sh deleted file mode 100755 index e6b28d7..0000000 --- a/scripts/restic_command.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -e - -SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) -REPO_DIR=$(dirname $SCRIPT_DIR) -DATA_DIR=$REPO_DIR - -ENV_FILE=$REPO_DIR/.env -source $ENV_FILE - -docker run -it --rm \ ---hostname $HOSTNAME \ ---env-file $ENV_FILE \ --v /etc/localtime:/etc/localtime:ro \ --v /etc/timezone:/etc/timezone:ro \ --v $DATA_DIR:/data \ --v $RESTIC_REPOSITORY:$RESTIC_REPOSITORY \ -restic/restic:latest "$@" diff --git a/scripts/setup.sh b/scripts/setup.sh index 198d930..f72ea3c 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,11 +1,12 @@ #!/bin/bash + set -e SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) REPO_DIR=$(dirname $SCRIPT_DIR) -COMPOSE_FILE=$REPO_DIR/docker-compose.yml $SCRIPT_DIR/clear_data.sh $SCRIPT_DIR/create_password.sh -docker compose -f $COMPOSE_FILE up -d \ No newline at end of file +alias compose="compose -f $REPO_DIR/docker-compose.yml" +docker compose up -d diff --git a/scripts/update.sh b/scripts/update.sh new file mode 100755 index 0000000..96b1cb1 --- /dev/null +++ b/scripts/update.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e + +SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) +REPO_DIR=$(dirname $SCRIPT_DIR) +cd $REPO_DIR + +git submodule update --remote --init + +alias compose="compose -f $REPO_DIR/docker-compose.yml" +docker compose pull +docker compose up -d