Commit graph

20 commits

Author SHA1 Message Date
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
Micke Nordin 75f75732e7
Fix repair command 2023-04-26 11:22:25 +02:00
Micke Nordin 8ca66c10ad
Add more repair commands and use tty for occ 2023-04-26 09:26:46 +02:00
Micke Nordin 7d10d168bd
Fix nc_upgrade_command 2023-04-25 17:48:13 +02:00
Micke Nordin d93cce4fc0
Handle mau 2023-04-03 14:11:28 +02:00
Micke Nordin 4963afd5f6
Handle clean up in a different way 2023-03-13 16:33:51 +01:00
Micke Nordin 18578817f1
Correct dir for backups 2023-03-13 16:27:36 +01:00
Micke Nordin 3fb6164501
Typo 2023-03-13 16:23:51 +01:00
Micke Nordin 392e83188b
Fix backups for new multionode dbs 2023-03-13 16:20:03 +01:00
Micke Nordin abd56622e7
Fix typo 2023-03-13 12:49:03 +01:00
Micke Nordin e9e70c5b29
Add in support for fullnode customers to folders in userbuckets 2023-03-13 12:41:23 +01:00
Micke Nordin 00256a7259
Use python 3.9 2023-02-28 14:24:11 +01:00
Micke Nordin 9dd730fcea
New format for multinode container names 2023-02-28 09:52:56 +01:00
Micke Nordin 1588d5869b
Remove underscore for user name 2023-02-27 15:18:14 +01:00
Micke Nordin 430521d96d
Update scripts to use rclone -c to use checksums instead of mtime 2023-02-24 10:18:40 +01:00
Micke Nordin d378b5f2da
Skip over statistics 2023-02-23 16:07:01 +01:00
Micke Nordin 3712e6228c
Redis sentinel no longer used 2023-02-23 15:44:55 +01:00
Micke Nordin 6dae356334
Fix scriptservers list users as well 2023-02-17 11:09:22 +01:00
Micke Nordin edddcbc5da
Use node1 everywhere for statistics 2023-02-17 10:28:18 +01:00
Micke Nordin f4e8786f0b
Import manifests from ops-repo 2023-02-13 10:44:56 +01:00