Compare commits
25
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bab5bf5ade
|
||
|
|
ebe01e00cc | ||
|
|
73787fef14 | ||
|
|
c029f4e65a | ||
|
|
6d2bdf5303 | ||
|
|
5042e50f55 | ||
|
|
789a9d0f42 | ||
|
|
19afffd8cd | ||
|
|
95b096c442 | ||
|
|
88f6f0b876 | ||
|
|
872e098bb9 | ||
|
|
57fadc2ea4 | ||
|
|
0f5ee292df | ||
|
|
74e8c1a3cc | ||
|
|
2b721698b0 | ||
|
|
bdaab88f08 | ||
|
|
89f88ce384 | ||
|
|
b244c2d855 | ||
|
|
302dfd23b7 | ||
|
|
d31aa15791 | ||
|
|
ec37f16553 | ||
|
|
6edc435e32 | ||
|
|
ee4e7270c8 | ||
|
|
c75df76fa6 | ||
|
|
0b33e79f1e |
@@ -1,3 +1,4 @@
|
||||
export CERTDUMPER_POST_VERSION=v1
|
||||
export POSTFIX_OVERRIDE_VERSION=v17
|
||||
export SENDER_LOGIN_VERSIONS=v2
|
||||
export PG_BACKUP_VERSION=v1
|
||||
|
||||
+24
-8
@@ -55,7 +55,7 @@ x-environment:
|
||||
|
||||
services:
|
||||
app:
|
||||
image: ghcr.io/mailu/nginx:2024.06.57
|
||||
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.1.2+2024.06.55"
|
||||
- "backupbot.backup=true"
|
||||
- "coop-cloud.${STACK_NAME}.version=3.2.1+2024.06.66"
|
||||
|
||||
db:
|
||||
image: redis:8.10.0-alpine
|
||||
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.57
|
||||
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.57
|
||||
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.57
|
||||
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.57
|
||||
image: ghcr.io/mailu/rspamd:2024.06.66
|
||||
environment: *default-env
|
||||
secrets:
|
||||
- secret_key
|
||||
@@ -154,7 +167,7 @@ services:
|
||||
disable: true
|
||||
|
||||
webmail:
|
||||
image: ghcr.io/mailu/webmail:2024.06.57
|
||||
image: ghcr.io/mailu/webmail:2024.06.66
|
||||
# entrypoint: "tail -f /dev/null"
|
||||
environment: *default-env
|
||||
networks:
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
$@
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
Contains mitigation measures for php2shell
|
||||
@@ -0,0 +1 @@
|
||||
Actual mitigation for php2shell pending further alpine image upgrades
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:recommended"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user