From 6f4e6322a100ad6bf7e8687d6d67d5f69beaef9e Mon Sep 17 00:00:00 2001
From: Emi Matchu <emi@matchu.dev>
Date: Tue, 27 Aug 2024 11:26:44 -0700
Subject: [PATCH] Upgrade to Plausible CE v2.1.1

I'm not done with this yet, because I don't actually totally know how to upgrade the Postgres database files?

I could potentially just reset, since I don't care a *ton* about historical data, but I'll try to learn how `pg_upgrade` works in the context of Docker.
---
 files/docker-compose.yml         | 18 ++++++++----------
 files/plausible-conf.example.env |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/files/docker-compose.yml b/files/docker-compose.yml
index 574741a..e4631ef 100755
--- a/files/docker-compose.yml
+++ b/files/docker-compose.yml
@@ -1,12 +1,8 @@
-version: "3.3"
 services:
-  mail:
-    image: bytemark/smtp
-    restart: always
-
   plausible_db:
-    # supported versions are 12, 13, and 14
-    image: postgres:14-alpine
+    # Plausible v2.1.1 was tested against PostgreSQL versions 15 and 16
+    # https://github.com/plausible/analytics/blob/v2.1.1/.github/workflows/elixir.yml#L21-L32
+    image: postgres:16-alpine
     restart: always
     volumes:
       - db-data:/var/lib/postgresql/data
@@ -14,10 +10,11 @@ services:
       - POSTGRES_PASSWORD=postgres
 
   plausible_events_db:
-    image: clickhouse/clickhouse-server:23.3.7.5-alpine
+    image: clickhouse/clickhouse-server:24.3.3.102-alpine
     restart: always
     volumes:
       - event-data:/var/lib/clickhouse
+      - event-logs:/var/log/clickhouse-server
       - ./clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
       - ./clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
     ulimits:
@@ -26,13 +23,12 @@ services:
         hard: 262144
 
   plausible:
-    image: plausible/analytics:v2.0
+    image: ghcr.io/plausible/community-edition:v2.1.1
     restart: always
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     depends_on:
       - plausible_db
       - plausible_events_db
-      - mail
     ports:
       - 127.0.0.1:8000:8000
     env_file:
@@ -43,3 +39,5 @@ volumes:
     driver: local
   event-data:
     driver: local
+  event-logs:
+    driver: local
diff --git a/files/plausible-conf.example.env b/files/plausible-conf.example.env
index 8faf4d5..a87f770 100644
--- a/files/plausible-conf.example.env
+++ b/files/plausible-conf.example.env
@@ -1,2 +1,3 @@
 BASE_URL=https://analytics.openneo.net
 SECRET_KEY_BASE=lfjsFSKLDFJSDFsdlkcvklsdjcsldfjsdf_EXAMPLE_KEYSMASHES
+TOTP_VAULT_KEY=jsdklfjsdklfjfSDJKLFJSDFsdlfjsdklfjksdlfOwO