Micke Nordin e0139b0765 BAckups: Fix db backups ... DB backup dir clashed with statistics script storage location, and also some permission errors. diff --git a/templates/script/backupdb.erb.sh b/templates/script/backupdb.erb.sh index b35acbc..1eb7992 100644 --- a/templates/script/backupdb.erb.sh +++ b/templates/script/backupdb.erb.sh @@ -6,11 +6,16 @@ sleep $((16#$(ip a | grep "link/ether" | head -1 | awk -F ':' '{print $6}' | awk number_of_full_to_keep="<%= @full_backup_retention %>" backup="${1}" +if [[ -z ${backup} ]]; then + backup="backup1.$(hostname -d)" +fi if ! [[ ${backup} =~ backup1.*sunet.se$ ]]; then echo "Usage: ${0} <fqdn of backup server>" echo "Example: ${0} backup1.sunet.drive.sunet.se" fi backup_dir="/opt/backups" +backup_dir_long="${backup_dir}/backups" +mkdir -p ${backup_dir} bucket="db-backups" mirror="<%= @customer %>-<%= @environment %>-mirror" if [[ ${mirror} =~ common-(test|prod)-mirror ]]; then @@ -23,11 +28,8 @@ ssh ${backup} "sudo /home/script/bin/backup_db.sh" echo "Cleaning up old backups for ${backup}" ssh ${backup} "sudo /home/script/bin/purge_backups.sh /opt/mariadb_backup/backups/" echo "Copying backups here" -mkdir -p ${backup_dir} -scp script@${backup}:/opt/mariadb_backup/backups/$(date +%Y/%m/%d)/*.gz ${backup_dir} +scp script@${backup}:/opt/mariadb_backup/backups/$(date +%Y/%m/%d)/*.gz ${backup_dir_long} echo "Copying backups to remote bucket" rclone mkdir ${mirror}:${bucket} duplicity --full-if-older-than 1M --tempdir /mnt --archive-dir /mnt --no-encryption ${backup_dir} rclone://${mirror}:/${bucket} duplicity remove-all-but-n-full ${number_of_full_to_keep} --tempdir /mnt --archive-dir /mnt --force rclone://${mirror}:/${bucket} -echo "cleaning up" -rm -r ${backup_dir} diff --git a/templates/scriptreceiver/backup_db.erb.sh b/templates/scriptreceiver/backup_db.erb.sh index 025a338..3e15f25 100644 --- a/templates/scriptreceiver/backup_db.erb.sh +++ b/templates/scriptreceiver/backup_db.erb.sh @@ -11,5 +11,7 @@ else fi docker exec ${container} /do_backup.sh ${customer} +chown root:script /opt/mariadb_backup/ +chmod 750 /opt/mariadb_backup/ chmod 755 ${backupdir} chown -R script:root ${backupdir}		2023-06-13 12:15:19 +02:00
..
backup_db.erb.sh	BAckups: Fix db backups	2023-06-13 12:15:19 +02:00
backup_multinode_db.erb.sh	Handle clean up in a different way	2023-03-13 16:33:51 +01:00
check_inodes	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
clear_scriptherder.erb.sh	Clear scriptherder script	2023-03-22 08:28:28 +01:00
create_bucket.erb.sh	New format for multinode container names	2023-02-28 09:52:56 +01:00
create_bucket_without_question.sh	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
ini2json.py	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
list_files_for_user.erb.sh	New format for multinode container names	2023-02-28 09:52:56 +01:00
list_users.erb.sh	New format for multinode container names	2023-02-28 09:52:56 +01:00
maintenancemode.erb.sh	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
makeswap.erb.sh	Fix swap once again	2023-02-23 16:52:36 +01:00
purge_backups.erb.sh	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
removeswap.erb.sh	Remove swap	2023-03-22 08:01:18 +01:00
restart_sunet_service.erb.sh	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
rotatefiles.erb	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
safer_reboot.erb	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
start_sentinel.erb.sh	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00
stop_sentinel.erb.sh	Import manifests from ops-repo	2023-02-13 10:44:56 +01:00