From 03e1d3266c1f0712516ae31d168e91008e3f0833 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 3 May 2024 18:16:09 +0200 Subject: [PATCH 1/3] chore: Add default rclone config --- scripts/rclone.conf.example | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 scripts/rclone.conf.example diff --git a/scripts/rclone.conf.example b/scripts/rclone.conf.example new file mode 100644 index 0000000..682ff45 --- /dev/null +++ b/scripts/rclone.conf.example @@ -0,0 +1,10 @@ +[overlay] +type = chunker +remote = Nicole: + +[Nicole] +type = ftp +host = 192.168.0.20 +user = USERNAME +pass = CHANGEME + From 7f801e64302c0b50335d26a869d8cd4c095b1b61 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 3 May 2024 18:33:46 +0200 Subject: [PATCH 2/3] fix(nextcloud): Include namespace in cp --- scripts/nextcloud/backup-database.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nextcloud/backup-database.sh b/scripts/nextcloud/backup-database.sh index 36f0349..da3e4a9 100755 --- a/scripts/nextcloud/backup-database.sh +++ b/scripts/nextcloud/backup-database.sh @@ -67,7 +67,7 @@ k3s kubectl exec "${database_container}" --namespace "${namespace}" -- env $(cat # Files backup for file in 'config' 'themes'; do printf "Copying %s\n" "${file}" - k3s kubectl cp "${base_container}":"/var/www/html/${file}" "${destination}" + k3s kubectl --namespace "${namespace}" cp "${base_container}":"/var/www/html/${file}" "${destination}" done # Turn off maintenance mode From 484b601bc078742b8b2ed5cef059fe7c05e14e20 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 3 May 2024 18:34:11 +0200 Subject: [PATCH 3/3] fix(vaultwarden): Convert from docker to k3s --- scripts/vaultwarden/backup-database.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/vaultwarden/backup-database.sh b/scripts/vaultwarden/backup-database.sh index 0b0c640..43069b4 100755 --- a/scripts/vaultwarden/backup-database.sh +++ b/scripts/vaultwarden/backup-database.sh @@ -41,9 +41,11 @@ else destination="${1}" fi +namespace="ix-vaultwarden-2" + # Retrieve container names -base_container="$( docker ps --format '{{.Names}}' | grep -E 'vaultwarden-2_vaultwarden-2-[0-9a-z]{10}-[0-9a-z]{5}' )" -database_container="$( docker ps --format '{{.Names}}' | grep postgres_vaultwarden-2-cnpg-main-1 )" +base_container="$( k3s kubectl get pods --namespace "${namespace}" | cut -f1 -d' ' | grep -E 'vaultwarden-2-[0-9a-z]{10}-[0-9a-z]{5}' )" +database_container="$( k3s kubectl get pods --namespace "${namespace}" | cut -f1 -d' ' | grep 'vaultwarden-2-cnpg-main-1' )" if ! [[ -n "${base_container}" && -n "${database_container}" ]]; then >&2 printf "Error: Not all containers could be found.\n" @@ -59,14 +61,14 @@ set -e database_backupfile="vaultwarden-sqlbkp_$(date +'%Y%m%d').bak" host_database_backupfile="${destination}/${database_backupfile}" -# Create backup file in docker container +# Create backup file in Kubernetes pod echo 'Backing up database' -docker exec --env-file "${env_file:=.env}" "${database_container}" pg_dump 'vaultwarden' -cwv -h 'localhost' -U 'vaultwarden' > "${host_database_backupfile}" +k3s kubectl exec "${database_container}" --namespace "${namespace}" -- env $(cat "${env_file:=.env}" | xargs) pg_dump 'vaultwarden' -cwv -h 'localhost' -U 'vaultwarden' > "${host_database_backupfile}" # Files backup for file in 'attachments' 'sends' 'rsa_key.pem' 'rsa_key.pub.pem'; do # 'config.json' printf 'Copying %s\n' "${file}" - docker cp -a "${base_container}":"/data/${file}" "${destination}" + k3s kubectl --namespace "${namespace}" cp "${base_container}":"/data/${file}" "${destination}" done # Backup cleanup