diff --git a/.gitignore b/.gitignore index 3f2f48a..bb0a16a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ state/tmp/ __pycache__/ *.pyc +backups/ diff --git a/backups/state/state-20260311T204828Z.sha256 b/backups/state/state-20260311T204828Z.sha256 deleted file mode 100644 index b81f8a9..0000000 --- a/backups/state/state-20260311T204828Z.sha256 +++ /dev/null @@ -1 +0,0 @@ -c12e3311b83081a11088001b31f7a698de8f349460000c9914d189d00a2ab207 /srv/prime-core/backups/state/state-20260311T204828Z.tar.gz diff --git a/backups/state/state-20260311T204828Z.tar.gz b/backups/state/state-20260311T204828Z.tar.gz deleted file mode 100644 index ad376f5..0000000 Binary files a/backups/state/state-20260311T204828Z.tar.gz and /dev/null differ diff --git a/backups/state/state-20260311T205918Z.sha256 b/backups/state/state-20260311T205918Z.sha256 deleted file mode 100644 index a99c184..0000000 --- a/backups/state/state-20260311T205918Z.sha256 +++ /dev/null @@ -1 +0,0 @@ -c12e3311b83081a11088001b31f7a698de8f349460000c9914d189d00a2ab207 /srv/prime-core/backups/state/state-20260311T205918Z.tar.gz diff --git a/backups/state/state-20260311T205918Z.tar.gz b/backups/state/state-20260311T205918Z.tar.gz deleted file mode 100644 index ad376f5..0000000 Binary files a/backups/state/state-20260311T205918Z.tar.gz and /dev/null differ diff --git a/backups/state/state-20260311T210329Z.sha256 b/backups/state/state-20260311T210329Z.sha256 deleted file mode 100644 index 1343892..0000000 --- a/backups/state/state-20260311T210329Z.sha256 +++ /dev/null @@ -1 +0,0 @@ -c12e3311b83081a11088001b31f7a698de8f349460000c9914d189d00a2ab207 /srv/prime-core/backups/state/state-20260311T210329Z.tar.gz diff --git a/backups/state/state-20260311T210329Z.tar.gz b/backups/state/state-20260311T210329Z.tar.gz deleted file mode 100644 index ad376f5..0000000 Binary files a/backups/state/state-20260311T210329Z.tar.gz and /dev/null differ diff --git a/scripts/backup/code-backup.sh b/scripts/backup/code-backup.sh index 862e37c..f85484a 100755 --- a/scripts/backup/code-backup.sh +++ b/scripts/backup/code-backup.sh @@ -4,8 +4,7 @@ BASE=/srv/prime-core cd "$BASE" source "$BASE/.secrets/git.env" export GIT_TERMINAL_PROMPT=0 -export GIT_SSH_COMMAND="ssh -i $GIT_SSH_KEY -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new" -EXPECTED='git@git.aeternalisgames.com:ashard_bot/prime-core.git' +EXPECTED='https://git.aeternalisgames.com/ashard_bot/prime-core.git' origin_url=$(git remote get-url origin 2>/dev/null || true) if [[ "$origin_url" != "$EXPECTED" ]]; then @@ -13,10 +12,12 @@ if [[ "$origin_url" != "$EXPECTED" ]]; then git remote add origin "$EXPECTED" fi +# never include runtime artifacts in code backup git add -A +git reset -q backups/ state/ .secrets/ || true if git diff --cached --quiet; then exit 0 fi git commit -m "prime-backup(code): $(date -u +'%Y-%m-%dT%H:%M:%SZ')" -git push origin main +git push "$GIT_REMOTE" main