diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index d4b25cc5..7c3753da 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -165,15 +165,7 @@ jobs: run: | docker login -u gitea-sonarqube-bot -p ${RINOA_REGISTRY_PASSWORD} git.trez.wtf - - name: Cache Vault install - id: cache-vault - uses: actions/cache@v4 - with: - path: /opt/hostedtoolcache/vault/${{ env.HC_VAULT_VERSION }}/x64 - key: vault-${{ runner.os }}-${{ env.HC_VAULT_VERSION }} - - name: Install Vault (only if not cached) - if: steps.cache-vault.outputs.cache-hit != 'true' uses: cpanato/vault-installer@main with: version: ${{ env.HC_VAULT_VERSION }} @@ -401,14 +393,7 @@ jobs: with: ref: main - - name: Cache Vault install - id: cache-vault - uses: actions/cache@v4 - with: - path: /root/.vault/vault - key: vault-${{ runner.os }}-${{ env.HC_VAULT_VERSION }} - - - name: Install Vault (only if not cached) + - name: Install Vault uses: cpanato/vault-installer@main with: version: ${{ env.HC_VAULT_VERSION }} diff --git a/docker-compose.yml b/docker-compose.yml index f20d674f..7bd71dbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4043,14 +4043,14 @@ services: container_name: automated-mongo-backup environment: MONGO_CONNECTION_STRING: mongodb://root:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/admin?replicaSet=rinoa - DAILY_BACKUP_INTERVAL_MINUTES: ${DAILY_BACKUP_INTERVAL_MINUTES} - MAX_DAILY_BACKUPS: ${MAX_DAILY_BACKUPS} - NUMBER_OF_WEEKLY_BACKUPS: ${NUMBER_OF_WEEKLY_BACKUPS} - MAX_AGE_OF_WEEKLY_BACKUPS: ${MAX_AGE_OF_WEEKLY_BACKUPS} - NUMBER_OF_MONTHLY_BACKUPS: ${NUMBER_OF_MONTHLY_BACKUPS} - MAX_AGE_OF_MONTHLY_BACKUPS: ${MAX_AGE_OF_MONTHLY_BACKUPS} - NUMBER_OF_YEARLY_BACKUPS: ${NUMBER_OF_YEARLY_BACKUPS} - MAX_AGE_OF_YEARLY_BACKUPS: ${MAX_AGE_OF_YEARLY_BACKUPS} + DAILY_BACKUP_INTERVAL_MINUTES: 60 + MAX_DAILY_BACKUPS: 24 + NUMBER_OF_WEEKLY_BACKUPS: 6 + MAX_AGE_OF_WEEKLY_BACKUPS: 1 + NUMBER_OF_MONTHLY_BACKUPS: 3 + MAX_AGE_OF_MONTHLY_BACKUPS: 1 + NUMBER_OF_YEARLY_BACKUPS: 1 + MAX_AGE_OF_YEARLY_BACKUPS: 1 BACKUP_PATH: /backups WEB_UI_PORT: 3000 TIMEZONE: ${TZ} @@ -4058,7 +4058,7 @@ services: labels: homepage.group: System Administration homepage.name: Automated Mongo Backup - homepage.href: https://amdbb.${MY_TLD} + homepage.href: https://amb.${MY_TLD} homepage.icon: /icons/auto-mongodb-bkup.png homepage.description: Backups for MongoDB swag: enable @@ -4067,7 +4067,7 @@ services: swag_url: amdb.${MY_TLD} swag.uptime-kuma.enabled: true swag.uptime-kuma.name: Automated Mongo Backup - swag.uptime-kuma.monitor.url: https://amdb.${MY_TLD} + swag.uptime-kuma.monitor.url: https://amb.${MY_TLD} swag.uptime-kuma.monitor.interval: 300 swag.uptime-kuma.monitor.retryInterval: 60 swag.uptime-kuma.monitor.maxretries: 5