Compare commits

...
Author SHA1 Message Date
moosemower bab5bf5ade Experimental backupbot support 2026-10-23 13:44:45 -07:00
kawaiipunk ebe01e00cc chore: publish 3.2.1+2024.06.66 release
continuous-integration/drone/tag Build is passing
2026-10-22 16:36:00 +01:00
kawaiipunk 73787fef14 Merge pull request 'chore(deps): update ghcr.io/mailu/postfix docker tag to v2024.06.66' (#23) from renovate/ghcr.io-mailu-postfix-2024.x into main
Reviewed-on: #23
2026-10-22 15:29:47 +00:00
kawaiipunk c029f4e65a Merge pull request 'chore(deps): update ghcr.io/mailu/nginx docker tag to v2024.06.66' (#22) from renovate/ghcr.io-mailu-nginx-2024.x into main
Reviewed-on: #22
2026-10-22 15:29:40 +00:00
kawaiipunk 6d2bdf5303 Merge pull request 'chore(deps): update ghcr.io/mailu/dovecot docker tag to v2024.06.66' (#20) from renovate/ghcr.io-mailu-dovecot-2024.x into main
Reviewed-on: #20
2026-10-22 15:29:32 +00:00
kawaiipunk 5042e50f55 Merge pull request 'chore(deps): update ghcr.io/mailu/rspamd docker tag to v2024.06.66' (#24) from renovate/ghcr.io-mailu-rspamd-2024.x into main
Reviewed-on: #24
2026-10-22 15:29:23 +00:00
kawaiipunk 789a9d0f42 Merge pull request 'chore(deps): update ghcr.io/mailu/admin docker tag to v2024.06.66' (#19) from renovate/ghcr.io-mailu-admin-2024.x into main
Reviewed-on: #19
2026-10-22 15:29:09 +00:00
renovate-bot 872e098bb9 chore(deps): update ghcr.io/mailu/rspamd docker tag to v2024.06.66 2026-10-22 14:15:46 +00:00
renovate-bot 57fadc2ea4 chore(deps): update ghcr.io/mailu/postfix docker tag to v2024.06.66 2026-10-22 14:15:44 +00:00
renovate-bot 0f5ee292df chore(deps): update ghcr.io/mailu/nginx docker tag to v2024.06.66 2026-10-22 14:15:41 +00:00
renovate-bot 74e8c1a3cc chore(deps): update ghcr.io/mailu/dovecot docker tag to v2024.06.66 2026-10-22 14:15:39 +00:00
renovate-bot 2b721698b0 chore(deps): update ghcr.io/mailu/admin docker tag to v2024.06.66 2026-10-22 14:15:36 +00:00
4 changed files with 60 additions and 6 deletions
+1
View File
@@ -1,3 +1,4 @@
export CERTDUMPER_POST_VERSION=v1
export POSTFIX_OVERRIDE_VERSION=v17
export SENDER_LOGIN_VERSIONS=v2
export PG_BACKUP_VERSION=v1
+22 -6
View File
@@ -55,7 +55,7 @@ x-environment:
services:
app:
image: ghcr.io/mailu/nginx:2024.06.61
image: ghcr.io/mailu/nginx:2024.06.66
logging:
driver: json-file
networks:
@@ -96,15 +96,25 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "coop-cloud.${STACK_NAME}.version=3.2.0+2024.06.61"
- "backupbot.backup=true"
- "coop-cloud.${STACK_NAME}.version=3.2.1+2024.06.66"
db:
image: redis:8.10.2-alpine
volumes:
- "redis:/data"
deploy:
labels:
backupbot.backup.pre-hook: "/pg_backup.sh backup"
backupbot.backup.volumes.postgres.path: "backup.sql"
backupbot.backup.post-hook: "/pg_backup.sh restore"
configs:
- source: pg_backup
target: /pg_backup.sh
mode: 0555
admin:
image: ghcr.io/mailu/admin:2024.06.61
image: ghcr.io/mailu/admin:2024.06.66
environment: *default-env
healthcheck:
disable: true
@@ -115,9 +125,12 @@ services:
- "mailu:/data"
networks:
- default
deploy:
labels:
- "backupbot.backup=true"
imap:
image: ghcr.io/mailu/dovecot:2024.06.61
image: ghcr.io/mailu/dovecot:2024.06.66
environment: *default-env
secrets:
- secret_key
@@ -131,7 +144,7 @@ services:
- default
smtp:
image: ghcr.io/mailu/postfix:2024.06.61
image: ghcr.io/mailu/postfix:2024.06.66
environment: *default-env
secrets:
- secret_key
@@ -143,7 +156,7 @@ services:
- app
antispam:
image: ghcr.io/mailu/rspamd:2024.06.61
image: ghcr.io/mailu/rspamd:2024.06.66
environment: *default-env
secrets:
- secret_key
@@ -221,6 +234,9 @@ configs:
certdumper_post:
name: ${STACK_NAME}_certdumper_post_${CERTDUMPER_POST_VERSION}
file: certdumper_post.sh
pg_backup:
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
file: pg_backup.sh
secrets:
secret_key:
+36
View File
@@ -0,0 +1,36 @@
#!/bin/bash
set -e
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
# TODO: this recipe doesn't have a db_password secret.
function backup {
export PGPASSWORD=$(cat /run/secrets/db_password)
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
}
function restore {
cd /var/lib/postgresql/data/
restore_config(){
# Restore allowed connections
cat pg_hba.conf.bak > pg_hba.conf
su postgres -c 'pg_ctl reload'
}
# Don't allow any other connections than local
cp pg_hba.conf pg_hba.conf.bak
echo "local all all trust" > pg_hba.conf
su postgres -c 'pg_ctl reload'
trap restore_config EXIT INT TERM
# Recreate Database
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
trap - EXIT INT TERM
restore_config
}
$@
+1
View File
@@ -0,0 +1 @@
Actual mitigation for php2shell pending further alpine image upgrades