diff --git a/deploy/backups/cronjobs/backup-borg-offsite.yaml b/deploy/backups/cronjobs/backup-borg-offsite.yaml index 30b89bb..f41f9a2 100644 --- a/deploy/backups/cronjobs/backup-borg-offsite.yaml +++ b/deploy/backups/cronjobs/backup-borg-offsite.yaml @@ -82,7 +82,7 @@ spec: value: ssh -p 2222 -o StrictHostKeyChecking=no -o LogLevel=ERROR - name: REPO_SYNC_MAX_SIZE - value: "21474836480" # 20GB + value: "5368709120" # 5GB - name: MODE value: SHELL @@ -98,8 +98,8 @@ spec: # sleep 5 # done - borg create ${BORG_REPO}::postgresql-export-$(date +%Y%m%d%H%M%S) /data/postgresql-export - borg create ${BORG_REPO}::gitea-data-$(date +%Y%m%d%H%M%S) /data/gitea-data --exclude /data/packages --exclude /data/tmp + borg create::postgresql-export-$(date +%Y%m%d%H%M%S) /data/postgresql-export + borg create ${BORG_REPO}::gitea-data-$(date +%Y%m%d%H%M%S) /data/gitea-data --exclude /data/gitea-data/packages --exclude /data/gitea-data/tmp #cleanup borg prune -v --list --keep-daily=10 --keep-weekly=7 --keep-monthly=-1 ${BORG_REPO} --glob-archives='gitea-data*' diff --git a/deploy/ops/bork-backup-sidekick/pod.yaml b/deploy/ops/bork-backup-sidekick/pod.yaml index d8fed43..7ed83ad 100644 --- a/deploy/ops/bork-backup-sidekick/pod.yaml +++ b/deploy/ops/bork-backup-sidekick/pod.yaml @@ -5,6 +5,8 @@ metadata: namespace: git-limbosolutions-com labels: app: borg-backup-sidekick + dbAccess: "true" + backups.infra.limbosolutions.com/ssh: "true" spec: containers: - name: borg-backup-sidekick @@ -21,14 +23,14 @@ spec: - name: BORG_REPO valueFrom: secretKeyRef: - name: gitea-backup-secret - key: borg_repo + name: gitea-backup + key: BORG_REPO - name: BORG_PASSPHRASE valueFrom: secretKeyRef: - name: gitea-backup-secret - key: borg_passphrase + name: gitea-backup + key: BORG_PASSPHRASE - name: BORG_RSH value: ssh -p 2222 -o StrictHostKeyChecking=no -o LogLevel=ERROR @@ -47,12 +49,12 @@ spec: - name: gitea-backup-secrets mountPath: /root/.ssh/id_rsa - subPath: ssh_id_rsa + subPath: SSH_ID_RSA readOnly: true - name: gitea-backup-secrets mountPath: /app/borg/key - subPath: borg_key + subPath: BORG_KEY volumes: - name: gitea-backup-secrets secret: