From 5945e44c7c60eec566ee7eb2ade8335bcc2622d3 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 1 Apr 2026 11:45:11 +0100
Subject: [PATCH] feat: finalize Matomo blueprint with official schema

---
 blueprints/matomo/template.toml | 44 +++++++++++++--------------------
 meta.json                       |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/blueprints/matomo/template.toml b/blueprints/matomo/template.toml
index b4d2adb3..5d78fb8c 100644
--- a/blueprints/matomo/template.toml
+++ b/blueprints/matomo/template.toml
@@ -1,29 +1,19 @@
-name = "Matomo"
-id = "matomo"
-description = "Leading open-source web analytics platform"
+[variables]
+MATOMO_DOMAIN = "${domain}"
+DATABASE_ROOT_PASSWORD = "${password:16}"
+DATABASE_PASSWORD = "${password:16}"
+DATABASE_NAME = "matomo"
+DATABASE_USERNAME = "matomo"
 
-[[variables]]
-name = "DOMAINS"
-label = "Matomo Domain"
-defaultValue = ""
-placeholder = "analytics.example.com"
+[config]
+[[config.domains]]
+serviceName = "matomo"
+port = 80
+host = "${MATOMO_DOMAIN}"
 
-[[variables]]
-name = "DATABASE_ROOT_PASSWORD"
-label = "MariaDB Root Password"
-defaultValue = "change-me-root"
-
-[[variables]]
-name = "DATABASE_NAME"
-label = "Database Name"
-defaultValue = "matomo"
-
-[[variables]]
-name = "DATABASE_USERNAME"
-label = "Database User"
-defaultValue = "matomo"
-
-[[variables]]
-name = "DATABASE_PASSWORD"
-label = "Database Password"
-defaultValue = "change-me-user"
+[config.env]
+DOMAINS = "${MATOMO_DOMAIN}"
+DATABASE_ROOT_PASSWORD = "${DATABASE_ROOT_PASSWORD}"
+DATABASE_PASSWORD = "${DATABASE_PASSWORD}"
+DATABASE_NAME = "${DATABASE_NAME}"
+DATABASE_USERNAME = "${DATABASE_USERNAME}"
diff --git a/meta.json b/meta.json
index c2e93057..1e3b9c2c 100644
--- a/meta.json
+++ b/meta.json
@@ -6783,7 +6783,7 @@
   {
     "id": "matomo",
     "name": "Matomo",
-    "version": "latest",
+    "version": "5.1-apache",
     "description": "Leading open-source web analytics platform with global data ownership.",
     "logo": "matomo.png",
     "links": {