diff --git a/.env.sample b/.env.sample index e49b3fa..c7fc131 100644 --- a/.env.sample +++ b/.env.sample @@ -7,14 +7,5 @@ DOMAIN=plausible.example.com LETS_ENCRYPT_ENV=production SECRET_KEY_BASE=replace-me -DISABLE_AUTH=false -DISABLE_REGISTRATION=true - -## SMTP settings (required — SMTP_HOST_PORT must be an integer) -SMTP_HOST_ADDR=localhost -MAILER_EMAIL=noreply@plausible.example.com -SMTP_HOST_PORT=25 -#SMTP_USER_NAME= -#SMTP_USER_PWD= -SMTP_HOST_SSL_ENABLED=false - +DISABLE_AUTH=replace-me # true or false +DISABLE_REGISTRATION=replace-me # true or false diff --git a/abra.sh b/abra.sh index 6044112..60974a7 100644 --- a/abra.sh +++ b/abra.sh @@ -1,5 +1,5 @@ export CLICKHOUSE_CONF_VERSION=v2 -export CLICKHOUSE_USER_CONF_VERSION=v3 +export CLICKHOUSE_USER_CONF_VERSION=v2 export CLICKHOUSE_ENTRYPOINT_VERSION=v6 export PG_BACKUP_VERSION=v1 export CLICKHOUSE_BACKUP_SCRIPT_VERSION=v1 diff --git a/clickhouse-user-config.xml b/clickhouse-user-config.xml index 42d5e40..f795286 100644 --- a/clickhouse-user-config.xml +++ b/clickhouse-user-config.xml @@ -1,17 +1,8 @@ - - + - - 1 - - 8192 - - 1 - - 0 - - 0 + 0 + 0 - + diff --git a/compose.yml b/compose.yml index dda5349..df14857 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: ghcr.io/plausible/community-edition:v3.2.1 + image: plausible/analytics:v2.0.0 command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run" depends_on: - db @@ -67,17 +67,10 @@ services: backupbot.restore.post-hook: "/pg_backup.sh restore" plausible_events_db: - image: clickhouse/clickhouse-server:24.12-alpine + image: clickhouse/clickhouse-server:23.4.6.25-alpine volumes: - event-data:/var/lib/clickhouse entrypoint: /custom-entrypoint.sh - environment: - - CLICKHOUSE_SKIP_USER_SETUP=1 - healthcheck: - test: ["CMD-SHELL", "clickhouse-client --query='SELECT 1'"] - interval: 5s - timeout: 5s - retries: 60 configs: - source: clickhouse-config target: /etc/clickhouse-server/config.d/logging.xml