From 13efdfab95d12b235e70102dc72f7aedefbd2c0f Mon Sep 17 00:00:00 2001 From: MTRNord Date: Tue, 13 Feb 2024 23:18:57 +0100 Subject: [PATCH 01/13] feat: Add Distributions Page --- .../distributions/distributions.toml | 31 +++++ content/ecosystem/distributions/index.md | 10 ++ sass/_distributions.scss | 59 ++++++++ sass/_projects.scss | 4 +- sass/style.scss | 1 + static/js/distributions.js | 20 +++ templates/ecosystem/distributions.html | 19 +++ templates/macros/distributions.html | 11 ++ templates/shortcodes/all_distributions.html | 126 ++++++++++++++++++ 9 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 content/ecosystem/distributions/distributions.toml create mode 100644 content/ecosystem/distributions/index.md create mode 100644 sass/_distributions.scss create mode 100644 static/js/distributions.js create mode 100644 templates/ecosystem/distributions.html create mode 100644 templates/macros/distributions.html create mode 100644 templates/shortcodes/all_distributions.html diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml new file mode 100644 index 0000000000..feda7cf700 --- /dev/null +++ b/content/ecosystem/distributions/distributions.toml @@ -0,0 +1,31 @@ +[[distributions]] +name = "matrix-docker-ansible-deploy" +description = "🐳 Matrix (An open network for secure, decentralized communication) server setup using Ansible and Docker" +vendor = "Splanteev" +maturity = "Stable" +frameworks = ["Ansible", "Docker"] +licence = "AGPL-3.0" +repository = "https://github.com/spantaleev/matrix-docker-ansible-deploy" +room = "#matrix-docker-ansible-deploy:devture.com" +support_level = "Community" + +[[distributions]] +name = "Ananace Helm Charts" +description = "Kubernetes applications packaged into helm charts" +vendor = "Ananace" +maturity = "Stable" +frameworks = ["Helm", "Kubernetes"] +licence = "Apache-2.0" +repository = "https://gitlab.com/ananace/charts" +room = "#matrix-on-kubernetes:fiksel.info" +support_level = "Community" + +[[distributions]] +name = "Element Server Suite" +description = "Element Server Suite (ESS) is a professional backend for Matrix-based communications that supports self-hosted and fully managed deployments. " +vendor = "Element" +maturity = "Stable" +frameworks = ["Kubernetes"] +licence = "Proprietary" +repository = "https://element.io/server-suite" +support_level = "Commercial" diff --git a/content/ecosystem/distributions/index.md b/content/ecosystem/distributions/index.md new file mode 100644 index 0000000000..bca7d39362 --- /dev/null +++ b/content/ecosystem/distributions/index.md @@ -0,0 +1,10 @@ ++++ +title = "Distributions" +template = "ecosystem/distributions.html" +weight = 1 +extra.summary = """ +A Matrix distribution is a collection of software related to Matrix that are deployed and automatically configured to work together. The software deployed needs to be able to join and participate in the public federation if the administrator configures it for this purpose. +""" ++++ + +{{ all_distributions() }} diff --git a/sass/_distributions.scss b/sass/_distributions.scss new file mode 100644 index 0000000000..be25fa454e --- /dev/null +++ b/sass/_distributions.scss @@ -0,0 +1,59 @@ +.distributions { + p { + text-align: center; + font-weight: 400; + font-size: 1.125rem; + line-height: 120%; + margin: 0 auto 4rem auto; + } +} + +.distribution-links { + margin-top: auto; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + gap: .7rem; + + a { + display: flex; + align-items: center; + gap: .3rem; + + border: 1px solid #777; + border-radius: 999px; + padding-inline: .5rem; + + font-size: .8rem; + + svg { + width: 1.2em; + height: 1.2em; + + * { + fill: #777; + } + + line { + stroke: #777; + } + } + } + + a:hover { + color: #fff; + background-color: #777; + + svg { + + * { + fill: #fff; + } + + line { + stroke: #fff; + } + } + } +} diff --git a/sass/_projects.scss b/sass/_projects.scss index 03c911ec22..9b95e19188 100644 --- a/sass/_projects.scss +++ b/sass/_projects.scss @@ -37,7 +37,7 @@ } h3 { - margin: 0; + margin: 0 .2rem 0 0; font-style: normal; font-weight: 700; @@ -192,6 +192,7 @@ font-size: 1rem; font-weight: 400; max-width: fit-content; + justify-self: flex-end; &.stable { background-color: #DFF6D5; @@ -225,6 +226,7 @@ justify-content: space-between; gap: .2rem; align-items: start; + flex-wrap: wrap; } #filters-overlay { diff --git a/sass/style.scss b/sass/style.scss index 9fc697a2b6..2a62f6290a 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -11,6 +11,7 @@ @import '_clients'; @import '_bridges'; @import '_servers'; +@import '_distributions'; @import '_sdks'; @import '_otwsu'; @import '_about-bios'; diff --git a/static/js/distributions.js b/static/js/distributions.js new file mode 100644 index 0000000000..4fa69853ec --- /dev/null +++ b/static/js/distributions.js @@ -0,0 +1,20 @@ +import { AllOfFilter, AnyOfFilter, refreshCardsView } from "./projects.js"; + +document.addEventListener('DOMContentLoaded', (event) => { + + var filters = []; + let maturityFilter = new AnyOfFilter("filter-maturity", "all-distributions", filters); + let supportFilter = new AnyOfFilter("filter-support", "all-distributions", filters); + let licenceFilter = new AnyOfFilter("filter-licence", "all-distributions", filters); + let frameworkFilter = new AnyOfFilter("filter-framework", "all-distributions", filters); + filters.push( + maturityFilter, + supportFilter, + licenceFilter, + frameworkFilter + ); + refreshCardsView("all-distributions", filters); + for (const filter of filters) { + filter.refreshActiveState(); + } +}) diff --git a/templates/ecosystem/distributions.html b/templates/ecosystem/distributions.html new file mode 100644 index 0000000000..f71ebab8e9 --- /dev/null +++ b/templates/ecosystem/distributions.html @@ -0,0 +1,19 @@ +{% extends "page.html" %} +{% block head_extra %} + + + +{% endblock head_extra%} +{% block content %} +
+
+

{{ page.title }}

+

{{ page.extra.summary }}

+
+
+
+

{{ page.content | safe }}

+
+{% endblock content %} diff --git a/templates/macros/distributions.html b/templates/macros/distributions.html new file mode 100644 index 0000000000..b10bf919dd --- /dev/null +++ b/templates/macros/distributions.html @@ -0,0 +1,11 @@ +{% macro classes(distribution) %} +maturity-{{ distribution.maturity | lower }} + +licence-{{ distribution.licence | slugify }} + +{% for framework in distribution.frameworks %} +framework-{{ framework | slugify }} +{% endfor %} + +support-{{ distribution.support_level | slugify }} +{% endmacro %} diff --git a/templates/shortcodes/all_distributions.html b/templates/shortcodes/all_distributions.html new file mode 100644 index 0000000000..41652bc000 --- /dev/null +++ b/templates/shortcodes/all_distributions.html @@ -0,0 +1,126 @@ +{% import "macros/distributions.html" as srvutils %} +{% set distributions_data = load_data(path="content/ecosystem/distributions/distributions.toml") %} +{% set licences = [] %} +{% set frameworks = [] %} +{% set support_levels = [] %} +{% for distribution in distributions_data.distributions %} +{% set_global licences = licences | concat(with=distribution.licence) %} +{% set_global frameworks = frameworks | concat(with=distribution.frameworks) %} +{% set_global support_levels = support_levels | concat(with=distribution.support_level) %} +{% endfor %} +{% set licences = licences | unique | sort %} +{% set frameworks = frameworks | unique | sort %} +{% set support_levels = support_levels | unique | sort %} + +
+
+ +
+

The distribution can support any of the maturity levels checked.

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
Select -
+
+
+
+ +
+

The distribution can support any of the licences checked.

+ {% for licence in licences %} +
+ + +
+ {% endfor %} +
Select -
+
+
+
+ +
+

The distribution is using any of the frameworks checked.

+ {% for framework in frameworks %} +
+ + +
+ {% endfor %} +
Select -
+
+
+
+ +
+

The distribution has any of these support levels.

+ {% for support in support_levels %} +
+ + +
+ {% endfor %} +
Select -
+
+
+
+ +
+ +
+ {% for distribution in distributions_data.distributions | sort(attribute="maturity") | reverse %} +
+
+
+

{{ distribution.name }}

+
{{ distribution.maturity }}
+
+
{{ distribution.licence }} · {% for framework in distribution.frameworks | slice(end=2) %}{{ + framework }}{% if not loop.last %} – {% endif %}{% endfor %}
+ {{ distribution.description | safe }} +
+ {% if distribution.repository %} + + {{ load_data(path="/assets/projects/repo.svg") | safe }} + Repository + + {% endif %} + {% if distribution.room %} + + {{ load_data(path="/assets/projects/matrix.svg") | safe }} + Matrix Room + + {% endif %} +
+
+
+ {% endfor %} +
From 11bd62bcee004bf45c8044487c3fa24065e1654f Mon Sep 17 00:00:00 2001 From: MTRNord Date: Tue, 13 Feb 2024 23:57:45 +0100 Subject: [PATCH 02/13] chore: Fix the description having a trailing space --- content/ecosystem/distributions/distributions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index feda7cf700..9dddab7ba7 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -22,7 +22,7 @@ support_level = "Community" [[distributions]] name = "Element Server Suite" -description = "Element Server Suite (ESS) is a professional backend for Matrix-based communications that supports self-hosted and fully managed deployments. " +description = "Element Server Suite (ESS) is a professional backend for Matrix-based communications that supports self-hosted and fully managed deployments." vendor = "Element" maturity = "Stable" frameworks = ["Kubernetes"] From 7e972ceae85a9fe1c27fd58ceb42d2328b425749 Mon Sep 17 00:00:00 2001 From: MTRNord Date: Tue, 13 Feb 2024 23:58:08 +0100 Subject: [PATCH 03/13] Add synapse-operator and BundesMessenger distributions --- .../distributions/distributions.toml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index 9dddab7ba7..fea8e76629 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -29,3 +29,24 @@ frameworks = ["Kubernetes"] licence = "Proprietary" repository = "https://element.io/server-suite" support_level = "Commercial" + +[[distributions]] +name = "synapse-operator" +description = "The Synapse operator offers a convenient way to deploy and manage a Synapse server. It was built with operator-sdk." +vendor = "Red Hat" +maturity = "Stable" +frameworks = ["Kubernetes"] +licence = "Apache-2.0" +repository = "https://github.com/opdev/synapse-operator" +support_level = "Community" + + +[[distributions]] +name = "BundesMessenger" +description = "The free & secure messenger for the public sector." +vendor = "BWI GmbH" +maturity = "Stable" +frameworks = ["Helm", "Kubernetes"] +licence = "Apache-2.0" +repository = "https://gitlab.opencode.de/bwi/bundesmessenger/info" +support_level = "Commercial" From 87e01d329312d2c7cd0869be53fa725466837bb9 Mon Sep 17 00:00:00 2001 From: MTRNord Date: Tue, 20 Feb 2024 14:54:50 +0100 Subject: [PATCH 04/13] chore: remove .vscode directory from version control --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1d3301065c..df13bc12ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /public .DS_Store gatsby - +.vscode From e57b9061839762af90d78bec72010b816de99a52 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:23:58 +0200 Subject: [PATCH 05/13] update ESS to ESS Community --- content/ecosystem/distributions/distributions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index fea8e76629..fb75318060 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -22,13 +22,13 @@ support_level = "Community" [[distributions]] name = "Element Server Suite" -description = "Element Server Suite (ESS) is a professional backend for Matrix-based communications that supports self-hosted and fully managed deployments." +description = "Element Server Suite Community Edition (ESS Community) allows you to deploy a Matrix stack using the provided Helm charts and a Kubernetes distribution of your choice, even if you don't have Kubernetes knowledge." vendor = "Element" maturity = "Stable" frameworks = ["Kubernetes"] -licence = "Proprietary" -repository = "https://element.io/server-suite" -support_level = "Commercial" +licence = "AGPL-3.0" +repository = "https://github.com/element-hq/ess-helm" +support_level = "Community" [[distributions]] name = "synapse-operator" From adce3d4edd312895256a4facc647ea0bd0d60990 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:25:09 +0200 Subject: [PATCH 06/13] update summary from PR review --- content/ecosystem/distributions/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/ecosystem/distributions/index.md b/content/ecosystem/distributions/index.md index bca7d39362..0430a99831 100644 --- a/content/ecosystem/distributions/index.md +++ b/content/ecosystem/distributions/index.md @@ -3,7 +3,7 @@ title = "Distributions" template = "ecosystem/distributions.html" weight = 1 extra.summary = """ -A Matrix distribution is a collection of software related to Matrix that are deployed and automatically configured to work together. The software deployed needs to be able to join and participate in the public federation if the administrator configures it for this purpose. +A Matrix distribution is a collection of software related to Matrix that is deployed and automatically configured so the different pieces integrate with one another. To appear on this list, users need to be able to join and participate in the public federation from an instance of a distribution if the administrator configures it for this purpose. """ +++ From 891bd4229a774bb018880acb6d8902f5dd3809b8 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:34:32 +0200 Subject: [PATCH 07/13] reorder, add opendesk --- .../distributions/distributions.toml | 66 +++++++++++-------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index fb75318060..1c5ae4ecf0 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -1,28 +1,37 @@ [[distributions]] -name = "matrix-docker-ansible-deploy" -description = "🐳 Matrix (An open network for secure, decentralized communication) server setup using Ansible and Docker" -vendor = "Splanteev" +name = "openDesk" +description = "The customisable office and collaboration suite designed specifically for your needs in public administration." +vendor = "ZenDiS GmbH" maturity = "Stable" -frameworks = ["Ansible", "Docker"] -licence = "AGPL-3.0" -repository = "https://github.com/spantaleev/matrix-docker-ansible-deploy" -room = "#matrix-docker-ansible-deploy:devture.com" -support_level = "Community" +frameworks = ["Helmfile", "Helm", "Kubernetes"] +licence = "Apache-2.0" +repository = "https://gitlab.opencode.de/bmi/opendesk" +support_level = "Commercial" [[distributions]] -name = "Ananace Helm Charts" -description = "Kubernetes applications packaged into helm charts" -vendor = "Ananace" +name = "BundesMessenger" +description = "The free & secure messenger for the public sector." +vendor = "BWI GmbH" maturity = "Stable" frameworks = ["Helm", "Kubernetes"] licence = "Apache-2.0" -repository = "https://gitlab.com/ananace/charts" -room = "#matrix-on-kubernetes:fiksel.info" +repository = "https://gitlab.opencode.de/bwi/bundesmessenger/info" +support_level = "Commercial" +matrix_standard = false + +[[distributions]] +name = "synapse-operator" +description = "The Synapse operator offers a convenient way to deploy and manage a Synapse server. It was built with operator-sdk." +vendor = "Red Hat" +maturity = "Stable" +frameworks = ["Kubernetes"] +licence = "Apache-2.0" +repository = "https://github.com/opdev/synapse-operator" support_level = "Community" [[distributions]] -name = "Element Server Suite" -description = "Element Server Suite Community Edition (ESS Community) allows you to deploy a Matrix stack using the provided Helm charts and a Kubernetes distribution of your choice, even if you don't have Kubernetes knowledge." +name = "ESS Community" +description = "Element Server Suite Community Edition allows you to deploy a Matrix stack using the provided Helm charts and a Kubernetes distribution of your choice, even if you don't have Kubernetes knowledge." vendor = "Element" maturity = "Stable" frameworks = ["Kubernetes"] @@ -31,22 +40,23 @@ repository = "https://github.com/element-hq/ess-helm" support_level = "Community" [[distributions]] -name = "synapse-operator" -description = "The Synapse operator offers a convenient way to deploy and manage a Synapse server. It was built with operator-sdk." -vendor = "Red Hat" +name = "Ananace Helm Charts" +description = "Kubernetes applications packaged into helm charts" +vendor = "Ananace" maturity = "Stable" -frameworks = ["Kubernetes"] +frameworks = ["Helm", "Kubernetes"] licence = "Apache-2.0" -repository = "https://github.com/opdev/synapse-operator" +repository = "https://gitlab.com/ananace/charts" +room = "#matrix-on-kubernetes:fiksel.info" support_level = "Community" - [[distributions]] -name = "BundesMessenger" -description = "The free & secure messenger for the public sector." -vendor = "BWI GmbH" +name = "matrix-docker-ansible-deploy" +description = "🐳 Matrix (An open network for secure, decentralized communication) server setup using Ansible and Docker" +vendor = "Splanteev" maturity = "Stable" -frameworks = ["Helm", "Kubernetes"] -licence = "Apache-2.0" -repository = "https://gitlab.opencode.de/bwi/bundesmessenger/info" -support_level = "Commercial" +frameworks = ["Ansible", "Docker"] +licence = "AGPL-3.0" +repository = "https://github.com/spantaleev/matrix-docker-ansible-deploy" +room = "#matrix-docker-ansible-deploy:devture.com" +support_level = "Community" From ff29a9b5a89f90d04a9eec611adc001dd7324c58 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:51:25 +0200 Subject: [PATCH 08/13] add matrix_standard tooltip --- content/ecosystem/distributions/distributions.toml | 5 +++++ sass/_distributions.scss | 11 +++++++++++ templates/shortcodes/all_distributions.html | 3 +++ 3 files changed, 19 insertions(+) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index 1c5ae4ecf0..be2c690766 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -7,6 +7,7 @@ frameworks = ["Helmfile", "Helm", "Kubernetes"] licence = "Apache-2.0" repository = "https://gitlab.opencode.de/bmi/opendesk" support_level = "Commercial" +matrix_standard = true [[distributions]] name = "BundesMessenger" @@ -28,6 +29,7 @@ frameworks = ["Kubernetes"] licence = "Apache-2.0" repository = "https://github.com/opdev/synapse-operator" support_level = "Community" +matrix_standard = true [[distributions]] name = "ESS Community" @@ -38,6 +40,7 @@ frameworks = ["Kubernetes"] licence = "AGPL-3.0" repository = "https://github.com/element-hq/ess-helm" support_level = "Community" +matrix_standard = true [[distributions]] name = "Ananace Helm Charts" @@ -49,6 +52,7 @@ licence = "Apache-2.0" repository = "https://gitlab.com/ananace/charts" room = "#matrix-on-kubernetes:fiksel.info" support_level = "Community" +matrix_standard = true [[distributions]] name = "matrix-docker-ansible-deploy" @@ -60,3 +64,4 @@ licence = "AGPL-3.0" repository = "https://github.com/spantaleev/matrix-docker-ansible-deploy" room = "#matrix-docker-ansible-deploy:devture.com" support_level = "Community" +matrix_standard = true diff --git a/sass/_distributions.scss b/sass/_distributions.scss index be25fa454e..648b031eab 100644 --- a/sass/_distributions.scss +++ b/sass/_distributions.scss @@ -57,3 +57,14 @@ } } } + +.standard { + border: 1px solid var(--borders-color); + border-radius: 9999px; + padding: 0 .6rem; + font-weight: 600; + justify-self: flex-end; + background-color: #F6D5D5; + border-color: #8B1212; + color: #8B1212; +} diff --git a/templates/shortcodes/all_distributions.html b/templates/shortcodes/all_distributions.html index 41652bc000..c20ed58cb7 100644 --- a/templates/shortcodes/all_distributions.html +++ b/templates/shortcodes/all_distributions.html @@ -102,6 +102,9 @@

{{ distribution.name }}

{{ distribution.maturity }}
+ {% if not distribution.matrix_standard %} +
!
+ {% endif %}
{{ distribution.licence }} · {% for framework in distribution.frameworks | slice(end=2) %}{{ framework }}{% if not loop.last %} – {% endif %}{% endfor %}
From ec1156baab77136a1e7de8ad3f9534bcc9668e41 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Mon, 8 Sep 2025 19:33:13 +0200 Subject: [PATCH 09/13] update support levels Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --- content/ecosystem/distributions/distributions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index be2c690766..1c900a1634 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -1,12 +1,12 @@ [[distributions]] -name = "openDesk" +name = "openDesk CE" description = "The customisable office and collaboration suite designed specifically for your needs in public administration." vendor = "ZenDiS GmbH" maturity = "Stable" frameworks = ["Helmfile", "Helm", "Kubernetes"] licence = "Apache-2.0" repository = "https://gitlab.opencode.de/bmi/opendesk" -support_level = "Commercial" +support_level = "Community" matrix_standard = true [[distributions]] @@ -17,7 +17,7 @@ maturity = "Stable" frameworks = ["Helm", "Kubernetes"] licence = "Apache-2.0" repository = "https://gitlab.opencode.de/bwi/bundesmessenger/info" -support_level = "Commercial" +support_level = "Community" matrix_standard = false [[distributions]] From 7dcf133d09c8eebca09efca821b64c28f97ab901 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:43:04 +0200 Subject: [PATCH 10/13] reorder ecosystem Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --- content/ecosystem/bridges/_index.md | 2 +- content/ecosystem/distributions/index.md | 2 +- content/ecosystem/hosting/index.md | 2 +- content/ecosystem/sdks/index.md | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/content/ecosystem/bridges/_index.md b/content/ecosystem/bridges/_index.md index 4c09bb0847..0a10dba370 100644 --- a/content/ecosystem/bridges/_index.md +++ b/content/ecosystem/bridges/_index.md @@ -1,6 +1,6 @@ +++ title = "Bridges" -weight = 2 +weight = 3 template = "ecosystem/bridges.html" extra.summary = """ Bridges allow you to connect Matrix to a third-party platform, and interact diff --git a/content/ecosystem/distributions/index.md b/content/ecosystem/distributions/index.md index 0430a99831..b544bdc96d 100644 --- a/content/ecosystem/distributions/index.md +++ b/content/ecosystem/distributions/index.md @@ -1,7 +1,7 @@ +++ title = "Distributions" template = "ecosystem/distributions.html" -weight = 1 +weight = 5 extra.summary = """ A Matrix distribution is a collection of software related to Matrix that is deployed and automatically configured so the different pieces integrate with one another. To appear on this list, users need to be able to join and participate in the public federation from an instance of a distribution if the administrator configures it for this purpose. """ diff --git a/content/ecosystem/hosting/index.md b/content/ecosystem/hosting/index.md index 23b7fc0bf5..bb30a1be4d 100644 --- a/content/ecosystem/hosting/index.md +++ b/content/ecosystem/hosting/index.md @@ -1,7 +1,7 @@ +++ title = "Hosting" template = "ecosystem/hosting.html" -weight = 4 +weight = 6 extra.summary = """ Everyone can host their Matrix server, but not everybody wants to. These are the providers the Matrix.org Foundation knows about. """ diff --git a/content/ecosystem/sdks/index.md b/content/ecosystem/sdks/index.md index f221206f5c..699116e386 100644 --- a/content/ecosystem/sdks/index.md +++ b/content/ecosystem/sdks/index.md @@ -1,6 +1,7 @@ +++ title = "SDKs" -weight = 3 +weight = 4 +extra.order = 4 template = "ecosystem/sdks.html" extra.summary = """ Develop great apps, bots, and bridges. Focus on what you do best. Let the SDKs From a20a7a436a366c1867c2abfcea221d90f19352fa Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Mon, 8 Sep 2025 23:55:53 +0200 Subject: [PATCH 11/13] add distros to CONTENT.md Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --- CONTENT.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/CONTENT.md b/CONTENT.md index aaf9064a04..e2ecea406f 100644 --- a/CONTENT.md +++ b/CONTENT.md @@ -241,7 +241,7 @@ maintainer = "Your name or organisation" maturity = "PICK ONE Stable OR Beta OR Alpha OR Obsolete" language = "The programminglanguage of your server. For example 'Python'" licence = "PICK ONE identifier from https://spdx.org/licenses/" -repository = "github.com/example-org/example-repo" +repository = "https://github.com/example-org/example-repo" # In which type of application this SDK is meant to get used. This should be an array. # Possible values are "bridge", "bot", "client" purpose = ["bot", "bridge"] @@ -250,11 +250,31 @@ A short description about the SDK. """ ``` +### Distributions + +Distros are listed in [`/content/ecosystem/distributions/distributions.toml`](https://github.com/matrix-org/matrix.org/blob/main/content/ecosystem/distributions/distributions.toml). A distribution is an artifact grouping multiple components of a Matrix stack and making them easy to deploy in one package. + +To add a distribution please use this template and append it to the `distributions.toml`: + +```toml +[[distributions]] +name = "My Matrix Distro" +description = "This is my distro, exactly how I like it." +vendor = "Your name or organisation" +maturity = "PICK ONE Stable OR Beta OR Alpha OR Obsolete" +frameworks = ["Name at least one installation technology.", "You may also add more."] +licence = "PICK ONE identifier from https://spdx.org/licenses/" +repository = "https://github.com/example-org/example-repo" +room = "#your-matrix-room:example.com" +support_level = "PICK ONE Community OR Commercial" +matrix_standard = true if it is compatible with Matrix standard apps, false if it only works fully when self-contained +``` + ### Hosting providers Hosting provders are listed in [`/content/ecosystem/hosting/providers.toml`](https://github.com/matrix-org/matrix.org/blob/main/content/ecosystem/hosting/providers.toml). It lists providers which provide Matrix components like servers or bots to customers. We require this section to only contain providers that do the actual hosting. Providers which either provide a setup script or only provide selfhosting should go into the in the future existing Distributions section instead. -To add a hosting provider entry, add the following template to the `providers.toml`. Logos should be placed next to the the toml file. A logo should be in the SVG format. However if this is not available a PNG is acceptable provided it has sufficient resolution while also having reasonable filesize. +To add a hosting provider entry, add the following template to the `providers.toml`. Logos should be placed next to the toml file. A logo should be in the SVG format. However if this is not available a PNG is acceptable provided it has sufficient resolution while also having reasonable filesize. ```toml [[providers]] From 47776f3b4119f231c5e79348342b109868324a3f Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:38:30 +0200 Subject: [PATCH 12/13] highly visible disclaimer Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --- templates/shortcodes/all_distributions.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/shortcodes/all_distributions.html b/templates/shortcodes/all_distributions.html index c20ed58cb7..2c18b1660d 100644 --- a/templates/shortcodes/all_distributions.html +++ b/templates/shortcodes/all_distributions.html @@ -102,13 +102,13 @@

{{ distribution.name }}

{{ distribution.maturity }}
- {% if not distribution.matrix_standard %} -
!
- {% endif %}
{{ distribution.licence }} · {% for framework in distribution.frameworks | slice(end=2) %}{{ framework }}{% if not loop.last %} – {% endif %}{% endfor %}
{{ distribution.description | safe }} + {% if not distribution.matrix_standard %} + This distro might not be entirely compatible with standard Matrix apps. + {% endif %}
{% if distribution.repository %} From f40d6103e1bd1fa61451a76ba9d4b8b05beb71e1 Mon Sep 17 00:00:00 2001 From: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:40:24 +0200 Subject: [PATCH 13/13] remove non-standard distro code Signed-off-by: HarHarLinks <2803622+HarHarLinks@users.noreply.github.com> --- content/ecosystem/distributions/distributions.toml | 11 ----------- templates/shortcodes/all_distributions.html | 3 --- 2 files changed, 14 deletions(-) diff --git a/content/ecosystem/distributions/distributions.toml b/content/ecosystem/distributions/distributions.toml index 1c900a1634..162391b2b2 100644 --- a/content/ecosystem/distributions/distributions.toml +++ b/content/ecosystem/distributions/distributions.toml @@ -9,17 +9,6 @@ repository = "https://gitlab.opencode.de/bmi/opendesk" support_level = "Community" matrix_standard = true -[[distributions]] -name = "BundesMessenger" -description = "The free & secure messenger for the public sector." -vendor = "BWI GmbH" -maturity = "Stable" -frameworks = ["Helm", "Kubernetes"] -licence = "Apache-2.0" -repository = "https://gitlab.opencode.de/bwi/bundesmessenger/info" -support_level = "Community" -matrix_standard = false - [[distributions]] name = "synapse-operator" description = "The Synapse operator offers a convenient way to deploy and manage a Synapse server. It was built with operator-sdk." diff --git a/templates/shortcodes/all_distributions.html b/templates/shortcodes/all_distributions.html index 2c18b1660d..41652bc000 100644 --- a/templates/shortcodes/all_distributions.html +++ b/templates/shortcodes/all_distributions.html @@ -106,9 +106,6 @@

{{ distribution.name }}

{{ distribution.licence }} · {% for framework in distribution.frameworks | slice(end=2) %}{{ framework }}{% if not loop.last %} – {% endif %}{% endfor %}
{{ distribution.description | safe }} - {% if not distribution.matrix_standard %} - This distro might not be entirely compatible with standard Matrix apps. - {% endif %}
{% if distribution.repository %}