diff --git a/compose.meilisearch.yml b/compose.meilisearch.yml index 0799a01..50c6788 100644 --- a/compose.meilisearch.yml +++ b/compose.meilisearch.yml @@ -9,7 +9,7 @@ services: - SEARCH_MEILI_INSTANCE=http://${STACK_NAME}_search:7700 search: - image: getmeili/meilisearch:v1.11 # WIP: upgrade from v1.11 to 1.14 + image: getmeili/meilisearch:v1.14 # WIP: upgrade from v1.11 to 1.14 secrets: - meili_master_key volumes: diff --git a/compose.yml b/compose.yml index f5e29f8..91ce4e0 100644 --- a/compose.yml +++ b/compose.yml @@ -113,20 +113,19 @@ services: restart_policy: condition: on-failure labels: - backupbot.backup: ${ENABLE_BACKUPS:-true} - # backupbot.backup.volumes.upload-data: "true" - # backupbot.backup.volumes.upload-data.path: "/opt/app/data/uploads" - traefik.enable: "true" - traefik.http.services.${STACK_NAME}.loadbalancer.server.port: "4000" - traefik.http.routers.${STACK_NAME}.rule: Host(`${DOMAIN}`${EXTRA_DOMAINS}) - traefik.http.routers.${STACK_NAME}.entrypoints: web-secure - traefik.http.routers.${STACK_NAME}.tls.certresolver: ${LETS_ENCRYPT_ENV} - #traefik.http.routers.${STACK_NAME}.middlewares: error-pages-middleware - #traefik.http.services.${STACK_NAME}.loadbalancer.server.port: 80 - ## Redirect from EXTRA_DOMAINS to DOMAIN - #traefik.http.routers.${STACK_NAME}.middlewares: ${STACK_NAME}-redirect - #traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost: true - #traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost: ${DOMAIN} + - "backupbot.backup=${ENABLE_BACKUPS:-true}" + #- backupbot.backup.volumes.upload-data: "true" + #- backupbot.backup.volumes.upload-data.path: "/opt/app/data/uploads" + - "traefik.enable=true" + - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=4000" + - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" + - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" + - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" + #- "traefik.http.routers.${STACK_NAME}.middlewares=error-pages-middleware" + #- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80" + #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" + #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" + #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" # healthcheck: # test: ["CMD", "curl", "-f", "http://localhost"] # interval: 30s diff --git a/pg_backup.sh b/pg_backup.sh index 652b7c4..7468807 100755 --- a/pg_backup.sh +++ b/pg_backup.sh @@ -24,7 +24,7 @@ function backup { function restore { echo "Restoring database from ${LATEST_BACKUP_FILE}..." - cd /var/lib/postgresql/data/ + cd ${BACKUP_PATH} function restore_config { echo "Restoring original pg_hba.conf configuration..."