From ee4afed826229abd1fe32c627eb9b92d7b429ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Thu, 27 Nov 2025 23:52:49 +0000
Subject: [PATCH] fix: backups jobs and better documentation

---
 README.md                                     | 32 +++++++++++--------
 .../.env.d/{id_rs.example => id_rsa.example}  |  0
 .../backups/backup-borg-offsite-cronjob.yaml  |  2 +-
 .../cronjobs/backups/backup-pbs-cronjob.yaml  |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)
 rename deploy/app/cronjobs/backups/.env.d/{id_rs.example => id_rsa.example} (100%)

diff --git a/README.md b/README.md
index c72a6cd..d2a93fb 100644
--- a/README.md
+++ b/README.md
@@ -5,41 +5,45 @@ Welcome to public repository of my [Git Server](https://git.limbosolutions.com)
 Using [gitea](https://git.limbosolutions.com/kb/gitea) as git server.
 
 - [Deploy](#deploy)
-  - [App Deploy](#app-deploy)
+  - [Environment files](#environment-files)
+  - [App](#app)
   - [Continuous Deploy](#continuous-deploy)
-  - [Infra Deploy](#infra-deploy)
-  - [Deploy all](#deploy-all)
+  - [Infra](#infra)
+  - [All](#all)
 - [Backups](#backups)
 
 ## Deploy
 
-### App Deploy
+### Environment files
 
-[Requires environment variables](./manifests/app/cronjobs/backups/.env.example).
-*Can be set creating file ./manifests/app/cronjobs/backups/.env with values.*
+- /.deploy/app/cronjobs/backups/.env.d/secrets [Example:](./deploy/app/cronjobs/backups/.env.d/secrets.example).
+- /.deploy/app/cronjobs/backups/.env.d/borg_key [Example:](./deploy/app/cronjobs/backups/.env.d/borg_key.example).
+- /.deploy/app/cronjobs/backups/.env.d/id_rsa [Example:](./deploy/app/cronjobs/backups/.env.d/id_rsa.example).
+
+### App
 
 ```bash
-./deploy-scripts/apply-app.sh
+./deploy/apply-app.sh
 ```
 
-- [Manifests](/manifests/infra)
+- [kustomization](/deploy/app/kustomization.yaml)
 
 ### Continuous Deploy
 
-Executes [App Deploy](#app-deploy) using an [Gitea workflow](./.gitea/workflows/app-deploy.yaml).
+Executes [App Deploy](#app) using an [Gitea workflow](./.gitea/workflows/app-deploy.yaml).
 
-### Infra Deploy
+### Infra
 
 ```bash
-./deploy-scripts/apply-infra.sh
+./deploy/apply-infra.sh
 ```
 
-- [Manifests](/manifests/app)
+- [kustomization](/deploy/infra/kustomization.yaml)
   
-### Deploy all
+### All
 
 ```bash
-./deploy-scripts/apply.sh
+./deploy/apply.sh
 ```
 
 ## Backups
diff --git a/deploy/app/cronjobs/backups/.env.d/id_rs.example b/deploy/app/cronjobs/backups/.env.d/id_rsa.example
similarity index 100%
rename from deploy/app/cronjobs/backups/.env.d/id_rs.example
rename to deploy/app/cronjobs/backups/.env.d/id_rsa.example
diff --git a/deploy/app/cronjobs/backups/backup-borg-offsite-cronjob.yaml b/deploy/app/cronjobs/backups/backup-borg-offsite-cronjob.yaml
index c781c46..50e48ce 100644
--- a/deploy/app/cronjobs/backups/backup-borg-offsite-cronjob.yaml
+++ b/deploy/app/cronjobs/backups/backup-borg-offsite-cronjob.yaml
@@ -108,7 +108,7 @@ spec:
                 else 
                   # Repository size is within limits for offsite sync
                   # ssh to backup server and enforce rclone to onedrive
-                  remote-connect "rclone sync $SSH_FOLDER $OFFSITE_TARGET_FOLDER --progress" && \
+                  remote-connect "rclone sync $SSH_FOLDER $OFFSITE_TARGET_FOLDER --stats=0" && \
                   echo "INFO: Finished Backup of git.limbosolutions.com (offsite) ($((SCRIPT_DURATION / 60 / 60)):$((SCRIPT_DURATION / 60)):$((SCRIPT_DURATION % 60))) "
                 fi
 
diff --git a/deploy/app/cronjobs/backups/backup-pbs-cronjob.yaml b/deploy/app/cronjobs/backups/backup-pbs-cronjob.yaml
index f440f2a..7604bda 100644
--- a/deploy/app/cronjobs/backups/backup-pbs-cronjob.yaml
+++ b/deploy/app/cronjobs/backups/backup-pbs-cronjob.yaml
@@ -52,7 +52,7 @@ spec:
                   valueFrom:
                     secretKeyRef:
                       name: gitea-backup
-                      key:  pbs_repository
+                      key:  PBS_REPOSITORY
                 - name: PBS_PASSWORD
                   valueFrom:
                     secretKeyRef: