.drone.yml

@@ -45,7 +45,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - toolshed/auto-recipes-catalogue-json
+        - coop-cloud/auto-recipes-catalogue-json
 
 trigger:
   event: tag

abra.sh

@@ -1,4 +1,4 @@
 export CLICKHOUSE_CONF_VERSION=v2
 export CLICKHOUSE_USER_CONF_VERSION=v2
 export DB_ENTRYPOINT_VERSION=v1
-export CLICKHOUSE_ENTRYPOINT_VERSION=v2
+export CLICKHOUSE_ENTRYPOINT_VERSION=v1

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: plausible/analytics:v2.0.0
+    image: plausible/analytics:v1.5.1
     command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
     depends_on:
       - db
@@ -14,10 +14,6 @@ services:
       - DATABASE_URL=postgres://plausible:plausible@${STACK_NAME}_db:5432/plausible
       - SMTP_HOST_ADDR
       - MAILER_EMAIL
-      - SMTP_HOST_PORT
-      - SMTP_USER_NAME
-      - SMTP_USER_PWD
-      - SMTP_HOST_SSL_ENABLED
       - DISABLE_REGISTRATION
       - DISABLE_AUTH
     networks:
@@ -32,9 +28,9 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - coop-cloud.${STACK_NAME}.version=3.0.1+v2.0.0
+        - coop-cloud.${STACK_NAME}.version=2.0.0+v1.5.1
   db:
-    image: postgres:13.12
+    image: postgres:13.11
     configs:
       - source: db_entrypoint
         target: /docker-entrypoint.sh
@@ -55,8 +51,7 @@ services:
         backupbot.backup.pre-hook: sh -c 'pg_dump -U "$$POSTGRES_USER" -Fc "$$POSTGRES_DB" | gzip > "/postgres.dump.gz"'
         backupbot.backup.path: "/postgres.dump.gz"
         backupbot.backup.post-hook: "rm -f /postgres.dump.gz"
-        backupbot.restore: "true"
+        backupbot.restore.post-hook: sh -c 'gzip -d /postgres.dump.gz && pg_restore -U "$$POSTGRES_USER" --dbname="$$PLAUSIBLE_DB" < /postgres.dump && rm /postgres.dump'
-        backupbot.restore.post-hook: sh -c 'gzip -d /postgres.dump.gz && pg_restore --clean -U "$$POSTGRES_USER" --dbname="$$PLAUSIBLE_DB" < /postgres.dump && rm -f /postgres.dump'
 
   plausible_events_db:
     image: clickhouse/clickhouse-server:23.4.2.11-alpine
@@ -79,8 +74,8 @@ services:
         backupbot.backup.pre-hook: clickhouse-backup create events
         backupbot.backup.path: "/var/lib/clickhouse/backup/events"
         backupbot.backup.post-hook: "rm -rf /var/lib/clickhouse/backup/events"
-        backupbot.restore: "true"
+        backupbot.restore.post-hook: clickhouse-backup restore events
-        backupbot.restore.post-hook: clickhouse-backup restore --rm events && rm -rf /var/lib/clickhouse/backup/events"
+        backupbot.resoter.post-hook: "rm -rf /var/lib/clickhouse/backup/events"
 
 volumes:
   db-data:

entrypoint.clickhouse.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 CLICKHOUSE_BACKUP_VERSION=2.4.2
 
@@ -13,8 +13,6 @@ elif [[ $ARCH =~ "armv6l" ]]; then
   ARCH="armv6"
 elif [[ $ARCH =~ "armv7l" ]]; then
   ARCH="armv7"
-elif [[ $ARCH =~ "x86_64" ]]; then
-  ARCH="amd64"
 fi
 
 wget \

release/3.0.0+v2.0.0

@@ -1,8 +0,0 @@
-⚠ WARNING! ⚠
-
-This major version upgrade of Plausible requires running a manual data migration
--- otherwise you'll see all historical data disappear (don't worry, it's
-"probably" still there). 
-
-Take a manual docker volume backup, then see here, and strap in: 
-https://github.com/plausible/analytics/discussions/3132