5 changed files with 30 additions and 15 deletions
+2
View File
@@ -6,10 +6,12 @@ DOMAIN=plausible.example.com
#EXTRA_DOMAINS=', `www.plausible.example.com`' #EXTRA_DOMAINS=', `www.plausible.example.com`'
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
#LOG_LEVEL=debug #LOG_LEVEL=debug
COMPOSE_FILE="compose.yml"
DISABLE_REGISTRATION=true # true or false DISABLE_REGISTRATION=true # true or false
# Mail Configuration # Mail Configuration
#COMPOSE_FILE="$COMPOSE_FILE:compose.mail.yml"
#SECRET_SMTP_PASSWORD_VERSION=v1 # generate=false #SECRET_SMTP_PASSWORD_VERSION=v1 # generate=false
#MAILER_ADAPTER=Bamboo.Mua #MAILER_ADAPTER=Bamboo.Mua
#MAILER_EMAIL=noreply@example.com #MAILER_EMAIL=noreply@example.com
+21
View File
@@ -0,0 +1,21 @@
---
version: "3.8"
services:
app:
environment:
- MAILER_ADAPTER
- SMTP_HOST_ADDR
- MAILER_EMAIL
- MAILER_NAME
- SMTP_HOST_PORT
- SMTP_USER_NAME
- SMTP_USER_PWD
- SMTP_HOST_SSL_ENABLED
secrets:
- smtp_password
secrets:
smtp_password:
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
external: true
+5 -15
View File
@@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: ghcr.io/plausible/community-edition:v2.1.0 image: ghcr.io/plausible/community-edition:v3.0.1
entrypoint: /plausible_entrypoint.sh entrypoint: /plausible_entrypoint.sh
depends_on: depends_on:
- db - db
@@ -13,20 +13,11 @@ services:
- SECRET_KEY_BASE - SECRET_KEY_BASE
- DATABASE_URL=postgres://plausible:plausible@${STACK_NAME}_db:5432/plausible - DATABASE_URL=postgres://plausible:plausible@${STACK_NAME}_db:5432/plausible
- CLICKHOUSE_DATABASE_URL=http://${STACK_NAME}_events:8123/plausible_events_db - CLICKHOUSE_DATABASE_URL=http://${STACK_NAME}_events:8123/plausible_events_db
- MAILER_ADAPTER
- SMTP_HOST_ADDR
- MAILER_EMAIL
- MAILER_NAME
- SMTP_HOST_PORT
- SMTP_USER_NAME
- SMTP_USER_PWD
- SMTP_HOST_SSL_ENABLED
- DISABLE_REGISTRATION - DISABLE_REGISTRATION
- LOG_LEVEL - LOG_LEVEL
secrets: secrets:
- totp_secret - totp_secret
- key_base - key_base
- smtp_password
configs: configs:
- source: plausible_entrypoint - source: plausible_entrypoint
target: /plausible_entrypoint.sh target: /plausible_entrypoint.sh
@@ -51,7 +42,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- coop-cloud.${STACK_NAME}.version=4.0.0+v2.1.0 - coop-cloud.${STACK_NAME}.version=5.0.0+v3.0.1
db: db:
image: pgautoupgrade/pgautoupgrade:18-alpine image: pgautoupgrade/pgautoupgrade:18-alpine
volumes: volumes:
@@ -83,9 +74,11 @@ services:
backupbot.restore.post-hook: "/pg_backup.sh restore" backupbot.restore.post-hook: "/pg_backup.sh restore"
events: events:
image: clickhouse/clickhouse-server:24.3.3.102-alpine image: clickhouse/clickhouse-server:24.12-alpine
volumes: volumes:
- event-data:/var/lib/clickhouse - event-data:/var/lib/clickhouse
environment:
- CLICKHOUSE_SKIP_USER_SETUP=1
entrypoint: /custom-entrypoint.sh entrypoint: /custom-entrypoint.sh
configs: configs:
- source: clickhouse_config - source: clickhouse_config
@@ -151,6 +144,3 @@ secrets:
key_base: key_base:
name: ${STACK_NAME}_key_base_${SECRET_KEY_BASE_VERSION} name: ${STACK_NAME}_key_base_${SECRET_KEY_BASE_VERSION}
external: true external: true
smtp_password:
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
external: true
+1
View File
@@ -0,0 +1 @@
fix smtp separation
+1
View File
@@ -0,0 +1 @@
Major upgrade of plausible version, but should not be breaking