diff --git a/.env.sample b/.env.sample index d02a0b1..4a669dd 100644 --- a/.env.sample +++ b/.env.sample @@ -75,6 +75,12 @@ LOGGING_LEVEL_LOGGERS_APP=INFO # Password is managed via Docker secret 'collabora_p' #COLLABORA_ADMIN_USERNAME=admin +############################################################################## +# BACKUPS +############################################################################## +# Set to false to disable backup-bot labels (default: true) +#ENABLE_BACKUPS=true + ############################################################################## # WOPI SCHEDULING ############################################################################## diff --git a/abra.sh b/abra.sh index 321e7b5..5c0a8e4 100755 --- a/abra.sh +++ b/abra.sh @@ -3,7 +3,7 @@ export ABRA_ENTRYPOINT_VERSION=v11 export NGINX_CONF_VERSION=v6 export ONLYOFFICE_CONF_VERSION=v2 -export PG_BACKUP_VERSION=v3 +export PG_BACKUP_VERSION=v4 environment() { # this exports all the secrets as environment variables diff --git a/compose.yml b/compose.yml index 2e44b5d..38d365e 100644 --- a/compose.yml +++ b/compose.yml @@ -99,7 +99,7 @@ services: labels: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - - "coop-cloud.${STACK_NAME}.version=0.7.0+v0.12.0" + - "coop-cloud.${STACK_NAME}.version=0.7.1+v0.12.0" environment: <<: [ *common-env ] healthcheck: @@ -280,6 +280,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.accessControlMaxAge=600" - "traefik.http.middlewares.${STACK_NAME}_minio-cors.headers.addVaryHeader=true" - "traefik.http.routers.${STACK_NAME}_minio.middlewares=${STACK_NAME}_minio-cors" + - "backupbot.backup=${ENABLE_BACKUPS:-true}" collabora: image: collabora/code:25.04.9.1.1 diff --git a/pg_backup.sh b/pg_backup.sh index 1fb7892..94c6b2a 100644 --- a/pg_backup.sh +++ b/pg_backup.sh @@ -10,7 +10,7 @@ function backup { } function restore { - cd /var/lib/postgresql/data/ + cd /var/lib/postgresql/data/pgdata restore_config(){ # Restore allowed connections cat pg_hba.conf.bak > pg_hba.conf