Removes DB permanence for analytics, retains permanence for matomo golden state

Author: marimeireles

core/caddy/Caddyfile

@@ -65,9 +65,9 @@
     handle @notBinary {
         # Only inject before </body> - the replace directive won't modify content
         # that doesn't contain this tag, providing natural HTML detection
-        replace "</body>" "<script src='http://performance.zoo/shared.js' async defer></script></body>"
-        replace "</BODY>" "<script src='http://performance.zoo/shared.js' async defer></script></BODY>"
-
+        replace "</body>" "<script src='https://performance.zoo/shared.js' async defer></script></body>"
+        replace "</BODY>" "<script src='https://performance.zoo/shared.js' async defer></script></BODY>"
+        
         header X-Performance-Zoo "injected"
     }
 }
@@ -413,7 +413,7 @@ http://search.zoo {
 snappymail.zoo {
     import logging
     import performance_zoo
-
+    
     route {
         import proxy_handler snappymail-zoo 8888
     }

core/mysql-analytics/Dockerfile

@@ -15,6 +15,9 @@ RUN curl -L https://raw.githubusercontent.com/bgrins/vwa_classifieds_optimized/f
 COPY seed/northwind-schema.sql /tmp/sql/northwind-schema.sql
 COPY seed/northwind-data.sql /tmp/sql/northwind-data.sql
 
+# Copy analytics seed
+COPY sql/analytics_seed.sql /tmp/sql/analytics_seed.sql
+
 # Copy initialization script
 COPY init-databases.sh /usr/local/bin/
 

core/mysql/Dockerfile

@@ -97,6 +97,11 @@ load_sql "northwind" "/tmp/sql/northwind-schema.sql"
 load_sql "northwind" "/tmp/sql/northwind-data.sql"
 create_snapshot "northwind"
 
+# Matomo analytics (analytics.zoo)
+create_db_for_site "analytics"
+load_sql "analytics" "/tmp/sql/analytics_seed.sql"
+create_snapshot "analytics"
+
 # Example: Add more databases here
 # create_db_for_site "myapp"
 # load_sql "myapp" "/tmp/sql/myapp_seed.sql"

core/mysql/init-databases.sh

@@ -231,30 +231,6 @@ services:
       start_period: 20s
       start_interval: 1s
 
-  mysql-analytics:
-    build:
-      context: ./core/mysql-analytics
-    restart: always
-    networks:
-      - zoo-network
-    environment:
-      - MYSQL_ROOT_PASSWORD=password
-      - MYSQL_DATABASE=analytics_db
-      - MYSQL_USER=analytics_user
-      - MYSQL_PASSWORD=analytics_pw
-    volumes:
-      - ./data/mysql-analytics:/var/lib/mysql
-    depends_on:
-      coredns:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-      start_period: 20s
-      start_interval: 1s
-
   hydra:
     build: ./core/hydra
     restart: always
@@ -738,9 +714,10 @@ services:
 
   analytics-zoo:
     <<: *zoo-common
-    image: matomo:5.5.1
+    build:
+      context: ./sites/apps/analytics.zoo
     environment:
-      - MATOMO_DATABASE_HOST=mysql-analytics
+      - MATOMO_DATABASE_HOST=mysql
       - MATOMO_DATABASE_ADAPTER=mysql
       - MATOMO_DATABASE_USERNAME=analytics_user
       - MATOMO_DATABASE_PASSWORD=analytics_pw
@@ -750,7 +727,7 @@ services:
     volumes:
       - ./data/matomo:/var/www/html
     depends_on:
-      mysql-analytics:
+      mysql:
         condition: service_healthy
     labels:
       - "zoo.domains=analytics.zoo:80"

core/mysql-analytics/seed/analytics.sql renamed to core/mysql/sql/analytics_seed.sql

@@ -36,18 +36,20 @@ Visit `https://analytics.zoo` and login:
 
 4. **Restart**: `docker compose restart performance-zoo caddy`
 5. **Capture golden state**: `./scripts/seed-data/capture-analytics-state.sh`
-6. **Commit**: `git add core/mysql-analytics/ sites/apps/analytics.zoo/data-golden/ sites/apps/performance.zoo/public/shared.js`
+6. **Commit**: `git add core/mysql/sql/analytics_seed.sql sites/apps/analytics.zoo/data-golden/`
 
 ## Architecture
 
-- **Golden state** (committed): `core/mysql-analytics/seed/analytics.sql`, `sites/apps/analytics.zoo/data-golden/`
-- **Runtime data** (gitignored): `data/mysql-analytics/`, `data/matomo/`
+- **Golden state**: `core/mysql/sql/analytics_seed.sql` (database schema + sites), `sites/apps/analytics.zoo/data-golden/config/` (Matomo config)
+- **Runtime data** (gitignored, ephemeral): `data/matomo/`
 - **Tracking**: Caddy injects `shared.js` into all .zoo pages
 
+**Note**: Analytics visit/pageview data is ephemeral and resets on each `npm start`. Site configurations and admin user are preserved via golden state. For persistent data collection across restarts, use an external harness to dump and restore analytics data.
+
 ## Troubleshooting
 
 **No tracking logs in console?** Hard refresh or clear cache
 
 **SSL certificate error?** Accept certs for `performance.zoo` and `analytics.zoo`
 
-**Setup wizard appears?** Run `./scripts/seed-data/capture-analytics-state.sh` and rebuild mysql-analytics
+**Setup wizard appears?** Run `./scripts/seed-data/capture-analytics-state.sh` and restart

docker-compose.yaml

@@ -5,9 +5,9 @@ echo "📊 Capturing Matomo Analytics Golden State"
 echo "==========================================="
 
 # Check if containers are running
-if ! docker compose ps mysql-analytics | grep -q "Up"; then
-  echo "❌ mysql-analytics container is not running"
-  echo "Start it with: docker compose --profile on-demand up -d mysql-analytics"
+if ! docker compose ps mysql | grep -q "Up"; then
+  echo "❌ mysql container is not running"
+  echo "Start it with: npm start"
   exit 1
 fi
 
@@ -18,19 +18,18 @@ if ! docker compose ps analytics-zoo | grep -q "Up"; then
 fi
 
 # Create directories
-mkdir -p core/mysql-analytics/seed
 mkdir -p sites/apps/analytics.zoo/data-golden
 
 echo ""
 echo "1️⃣ Capturing MySQL database state..."
-docker exec the_zoo-mysql-analytics-1 mysqldump \
+docker exec the_zoo-mysql-1 mysqldump \
   -u analytics_user \
   -panalytics_pw \
   analytics_db \
-  > core/mysql-analytics/seed/analytics.sql
+  > core/mysql/sql/analytics_seed.sql
 
-echo "✅ Database dump saved to core/mysql-analytics/seed/analytics.sql"
-echo "   Size: $(du -h core/mysql-analytics/seed/analytics.sql | cut -f1)"
+echo "✅ Database dump saved to core/mysql/sql/analytics_seed.sql"
+echo "   Size: $(du -h core/mysql/sql/analytics_seed.sql | cut -f1)"
 
 echo ""
 echo "2️⃣ Capturing Matomo application data..."
@@ -58,5 +57,5 @@ echo "✨ Golden state captured successfully!"
 echo ""
 echo "Next steps:"
 echo "1. Review the captured files"
-echo "2. Commit to git: git add core/mysql-analytics sites/apps/analytics.zoo/data-golden"
-echo "3. Update mysql-analytics container to load seed on first start"
+echo "2. Commit to git: git add core/mysql/sql/analytics_seed.sql sites/apps/analytics.zoo/data-golden"
+echo "3. Rebuild containers: docker compose up -d analytics-zoo --build"

docs/analytics.md

@@ -1,7 +1,7 @@
 ; <?php exit; ?> DO NOT REMOVE THIS LINE
 ; file automatically generated or modified by Matomo; you can manually override the default values in global.ini.php by redefining them in this file.
 [database]
-host = "mysql-analytics"
+host = "mysql"
 username = "analytics_user"
 password = "analytics_pw"
 dbname = "analytics_db"

scripts/seed-data/capture-analytics-state.sh

@@ -10,4 +10,4 @@ if [ -d "/golden-data/config" ] && [ ! -f "/var/www/html/config/config.ini.php"
 fi
 
 echo "Starting Apache..."
-exec docker-entrypoint.sh "$@"
+exec /entrypoint.sh "$@"