diff --git a/.gitignore b/.gitignore index 70fbb15..22104fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +*.bak +.*.bak *.sec .*.sec diff --git a/Server/Scripts/Backup/BackupGlobals.cfg b/Server/Scripts/Backup/BackupGlobals.cfg index 0d0a473..d4c2e65 100644 --- a/Server/Scripts/Backup/BackupGlobals.cfg +++ b/Server/Scripts/Backup/BackupGlobals.cfg @@ -19,5 +19,5 @@ Hash2() { ccencryptNow() { File="$1" BaseKey="$2" - ccrypt -e -K"$(Hash2 "${BaseKey}" "${RunDate}")" "${File}" + ccrypt -e -f -K"$(Hash2 "${BaseKey}" "${RunDate}")" "${File}" } diff --git a/Server/Scripts/Backup/CloudBackup.sh b/Server/Scripts/Backup/CloudBackup.sh index 5f4f92d..59057fc 100755 --- a/Server/Scripts/Backup/CloudBackup.sh +++ b/Server/Scripts/Backup/CloudBackup.sh @@ -5,15 +5,14 @@ GitPush() { git add . - git commit -m "Auto Backup $(date)" + git commit -m "Auto-Backup $(date) (${RunDate})" git push } cd ./Server-Backup-Limited -#mkdir -p ./tmp && cd ./tmp -Item="Invidious-User" && cp "../../${Item}/Latest.7z" "./${Item}.7z" && ccencryptNow "./${Item}.7z" "${BackupKey_Git_Invidious}" -Item="wallabag-data" && cp "../../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_wallabag}" -Item="FreshRSS-data" && cp "../../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_FreshRSS}" +Item="Invidious-User" && cp "../${Item}/Latest.7z" "./${Item}.7z" && ccencryptNow "./${Item}.7z" "${BackupKey_Git_Invidious}" +Item="wallabag-data" && cp "../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_wallabag}" +Item="FreshRSS-data" && cp "../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_FreshRSS}" GitPush cd .. diff --git a/Server/Scripts/Backup/ServerDataBackup.sh b/Server/Scripts/Backup/ServerDataBackup.sh index c32cba9..c144194 100755 --- a/Server/Scripts/Backup/ServerDataBackup.sh +++ b/Server/Scripts/Backup/ServerDataBackup.sh @@ -9,29 +9,8 @@ SimpleBackup() { cp "./$1/${RunDate}.tar.xz" "./$1/Latest.tar.xz" } -# Wallabag SimpleBackup "wallabag-data" -#Name="wallabag-data" -#mkdir -p "./${Name}" -#tar cvJSf "./${Name}/${Date}.tar.xz" "/Server/${Name}" && \ -#cp "./${Name}/${Date}.tar.xz" "./${Name}/Latest.tar.xz" -#7z a -mmt1 -mx9 \ -# "./${Name}/${Date}.7z" /Server/wallabag-data && \ -# cp "./${Name}/${Date}.7z" "./${Name}/Latest.7z" - -# FreshRSS SimpleBackup "FreshRSS-data" -#Name="FreshRSS-data" -#mkdir -p "./${Name}" -#tar cvJSf "./${Name}/${Date}.tar.xz" "/Server/${Name}" && \ -#cp "./${Name}/${Date}.tar.xz" "./${Name}/Latest.tar.xz" -#7z a -mmt1 -mx9 \ -# "./${Name}/${Date}.7z" /Server/FreshRSS/data && \ -# cp "./${Name}/${Date}.7z" "./${Name}/Latest.7z" -#7z a -mmt1 -mx9 \ -# "./FreshRSS-data/${Date}.7z" /media/Disk/Server/docker-base/volumes/775f882852d2ca0efacd0e92426d07a1257c6ffc65aa83ce0970969c95f0fefd/_data/www/freshrss/data && \ -# cp "./FreshRSS-data/${Date}.7z" ./FreshRSS-data/Latest.7z -#7z a -mx9 -mmt1 "./FreshRSS-data/$Date.7z" /Server/FreshRSS/data && cp "./FreshRSS-data/$Date.7z" ./FreshRSS-data/latest.7z # GoToSocial #Name="GoToSocial"