diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c109b803..0edfed5f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only * @element-hq/server-products-developers diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5e76d203..9f0c5d96 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only --- version: 2 updates: diff --git a/.github/workflows/actions-linting.yml b/.github/workflows/actions-linting.yml index c9411ce3..f2faaa02 100644 --- a/.github/workflows/actions-linting.yml +++ b/.github/workflows/actions-linting.yml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: GitHub Actions linting diff --git a/.github/workflows/artifact-hub.yml b/.github/workflows/artifact-hub.yml index b1199bef..976426c1 100644 --- a/.github/workflows/artifact-hub.yml +++ b/.github/workflows/artifact-hub.yml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Artifact Hub Metadata diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ead0edfc..dd68f9e3 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Helm Chart Building tests on: diff --git a/.github/workflows/changelog_check.yml b/.github/workflows/changelog_check.yml index 81828b1d..1ef054d5 100644 --- a/.github/workflows/changelog_check.yml +++ b/.github/workflows/changelog_check.yml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Changelog on: [pull_request] diff --git a/.github/workflows/licensing.yml b/.github/workflows/licensing.yml index 95989bb0..fb55d9cb 100644 --- a/.github/workflows/licensing.yml +++ b/.github/workflows/licensing.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Licensing checks diff --git a/.github/workflows/matrix-tools.yml b/.github/workflows/matrix-tools.yml index d4d7f70f..48764180 100644 --- a/.github/workflows/matrix-tools.yml +++ b/.github/workflows/matrix-tools.yml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Build matrix-tool Docker Images @@ -87,9 +87,9 @@ jobs: type=raw,value=${{ env.VERSION }},enable=${{ github.ref_type == 'tag' }} type=sha,prefix=sha-,format=short labels: | - org.opencontainers.image.licenses=AGPL-3.0-only OR LicenseRef-Element-Commercial + org.opencontainers.image.licenses=AGPL-3.0-only annotations: | - org.opencontainers.image.licenses=AGPL-3.0-only OR LicenseRef-Element-Commercial + org.opencontainers.image.licenses=AGPL-3.0-only - name: Build and Push Image uses: docker/bake-action@4ba453fbc2db7735392b93edf935aaf9b1e8f747 # v6 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index db2799e0..55b8431d 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Run Pytest tests diff --git a/.github/workflows/releasing.yml b/.github/workflows/releasing.yml index 8f579995..dc2f8e60 100644 --- a/.github/workflows/releasing.yml +++ b/.github/workflows/releasing.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Helm Chart packaging and releasing on: diff --git a/.github/workflows/scripts-linting.yml b/.github/workflows/scripts-linting.yml index b6998bea..b1c00263 100644 --- a/.github/workflows/scripts-linting.yml +++ b/.github/workflows/scripts-linting.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only name: Scripts linting diff --git a/.gitignore b/.gitignore index 6617b492..347065a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only __pycache__ .ca diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a2f7942..f0c42d36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ diff --git a/DEVELOPERS.md b/DEVELOPERS.md index a52722b7..4ced9bb7 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -1,7 +1,7 @@ diff --git a/LICENSE-COMMERCIAL b/LICENSE-COMMERCIAL deleted file mode 100644 index 39041ce0..00000000 --- a/LICENSE-COMMERCIAL +++ /dev/null @@ -1,6 +0,0 @@ -Licensees holding a valid commercial license with Element may use this -software in accordance with the terms contained in a written agreement -between you and Element. - -To purchase a commercial license please contact our sales team at -licensing@element.io diff --git a/LICENSES/LicenseRef-Element-Commercial.txt b/LICENSES/LicenseRef-Element-Commercial.txt deleted file mode 100644 index 39041ce0..00000000 --- a/LICENSES/LicenseRef-Element-Commercial.txt +++ /dev/null @@ -1,6 +0,0 @@ -Licensees holding a valid commercial license with Element may use this -software in accordance with the terms contained in a written agreement -between you and Element. - -To purchase a commercial license please contact our sales team at -licensing@element.io diff --git a/README.md b/README.md index 487a39e9..e4e66a8a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
diff --git a/REUSE.toml b/REUSE.toml index f5118614..0312b67c 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -3,29 +3,29 @@ version = 1 [[annotations]] path = "charts/**/Chart.lock" SPDX-FileCopyrightText = "Copyright 2024 New Vector Ltd" -SPDX-License-Identifier = "AGPL-3.0-only OR LicenseRef-Element-Commercial" +SPDX-License-Identifier = "AGPL-3.0-only" [[annotations]] path = "charts/**/*.json" SPDX-FileCopyrightText = "Copyright 2024 New Vector Ltd" -SPDX-License-Identifier = "AGPL-3.0-only OR LicenseRef-Element-Commercial" +SPDX-License-Identifier = "AGPL-3.0-only" [[annotations]] path = "poetry.lock" SPDX-FileCopyrightText = "Copyright 2024 New Vector Ltd" -SPDX-License-Identifier = "AGPL-3.0-only OR LicenseRef-Element-Commercial" +SPDX-License-Identifier = "AGPL-3.0-only" [[annotations]] path = "scripts/testdata/**/*.json" SPDX-FileCopyrightText = "Copyright 2024 New Vector Ltd" -SPDX-License-Identifier = "AGPL-3.0-only OR LicenseRef-Element-Commercial" +SPDX-License-Identifier = "AGPL-3.0-only" [[annotations]] path = "newsfragments/*.md" SPDX-FileCopyrightText = "Copyright 2025 New Vector Ltd" -SPDX-License-Identifier = "AGPL-3.0-only OR LicenseRef-Element-Commercial" +SPDX-License-Identifier = "AGPL-3.0-only" [[annotations]] path = "docs/assets/images/*.png" SPDX-FileCopyrightText = "Copyright 2025 New Vector Ltd" -SPDX-License-Identifier = "AGPL-3.0-only OR LicenseRef-Element-Commercial" +SPDX-License-Identifier = "AGPL-3.0-only" diff --git a/artifacthub-repo.yaml b/artifacthub-repo.yaml index 70786b44..5b92f210 100644 --- a/artifacthub-repo.yaml +++ b/artifacthub-repo.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only repositoryID: f900b890-eb67-4328-9100-336301f7cefe owners: diff --git a/charts/matrix-stack/.helmignore b/charts/matrix-stack/.helmignore index ffe59352..57a3349a 100644 --- a/charts/matrix-stack/.helmignore +++ b/charts/matrix-stack/.helmignore @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only .helmignore matrix-stack-*.tgz diff --git a/charts/matrix-stack/Chart.yaml b/charts/matrix-stack/Chart.yaml index 59bf5a03..1b1df239 100644 --- a/charts/matrix-stack/Chart.yaml +++ b/charts/matrix-stack/Chart.yaml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only apiVersion: v2 name: matrix-stack diff --git a/charts/matrix-stack/README.md b/charts/matrix-stack/README.md index 949854d4..2a63adb7 100644 --- a/charts/matrix-stack/README.md +++ b/charts/matrix-stack/README.md @@ -1,7 +1,7 @@ # Matrix Stack Chart diff --git a/charts/matrix-stack/ci/element-web-checkov-values.yaml b/charts/matrix-stack/ci/element-web-checkov-values.yaml index c21b374e..f7b57b25 100644 --- a/charts/matrix-stack/ci/element-web-checkov-values.yaml +++ b/charts/matrix-stack/ci/element-web-checkov-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: element-web-minimal.yaml element-web-checkov.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/element-web-minimal-values.yaml b/charts/matrix-stack/ci/element-web-minimal-values.yaml index c7afd8e5..6a74df32 100644 --- a/charts/matrix-stack/ci/element-web-minimal-values.yaml +++ b/charts/matrix-stack/ci/element-web-minimal-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: element-web-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/example-default-enabled-components-values.yaml b/charts/matrix-stack/ci/example-default-enabled-components-values.yaml index 003c4209..7af3f604 100644 --- a/charts/matrix-stack/ci/example-default-enabled-components-values.yaml +++ b/charts/matrix-stack/ci/example-default-enabled-components-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: element-web-minimal.yaml synapse-minimal.yaml matrix-authentication-service-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml well-known-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/fragments/element-web-checkov.yaml b/charts/matrix-stack/ci/fragments/element-web-checkov.yaml index 029419eb..96d92b0f 100644 --- a/charts/matrix-stack/ci/fragments/element-web-checkov.yaml +++ b/charts/matrix-stack/ci/fragments/element-web-checkov.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only elementWeb: annotations: diff --git a/charts/matrix-stack/ci/fragments/element-web-minimal.yaml b/charts/matrix-stack/ci/fragments/element-web-minimal.yaml index 0700eaf6..7d85aae6 100644 --- a/charts/matrix-stack/ci/fragments/element-web-minimal.yaml +++ b/charts/matrix-stack/ci/fragments/element-web-minimal.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only elementWeb: enabled: true diff --git a/charts/matrix-stack/ci/fragments/element-web-pytest-extras.yaml b/charts/matrix-stack/ci/fragments/element-web-pytest-extras.yaml index bcc00300..a560a9b6 100644 --- a/charts/matrix-stack/ci/fragments/element-web-pytest-extras.yaml +++ b/charts/matrix-stack/ci/fragments/element-web-pytest-extras.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only serverName: ess.localhost diff --git a/charts/matrix-stack/ci/fragments/haproxy-checkov.yaml b/charts/matrix-stack/ci/fragments/haproxy-checkov.yaml index 5a069923..684804de 100644 --- a/charts/matrix-stack/ci/fragments/haproxy-checkov.yaml +++ b/charts/matrix-stack/ci/fragments/haproxy-checkov.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only haproxy: annotations: diff --git a/charts/matrix-stack/ci/fragments/init-secrets-checkov.yaml b/charts/matrix-stack/ci/fragments/init-secrets-checkov.yaml index 78808785..0f9718f5 100644 --- a/charts/matrix-stack/ci/fragments/init-secrets-checkov.yaml +++ b/charts/matrix-stack/ci/fragments/init-secrets-checkov.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only initSecrets: annotations: diff --git a/charts/matrix-stack/ci/fragments/init-secrets-minimal.yaml b/charts/matrix-stack/ci/fragments/init-secrets-minimal.yaml index b11fdcbb..9c32ce15 100644 --- a/charts/matrix-stack/ci/fragments/init-secrets-minimal.yaml +++ b/charts/matrix-stack/ci/fragments/init-secrets-minimal.yaml @@ -1,4 +1,4 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only diff --git a/charts/matrix-stack/ci/fragments/init-secrets-pytest-extras.yaml b/charts/matrix-stack/ci/fragments/init-secrets-pytest-extras.yaml index a911fd35..f77e62af 100644 --- a/charts/matrix-stack/ci/fragments/init-secrets-pytest-extras.yaml +++ b/charts/matrix-stack/ci/fragments/init-secrets-pytest-extras.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only initSecrets: annotations: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-checkov.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-checkov.yaml index 1ad28eef..f56740ac 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-checkov.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-checkov.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: annotations: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-external-synapse.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-external-synapse.yaml index 84f71f8b..97bea0b0 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-external-synapse.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-external-synapse.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: additional: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-minimal.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-minimal.yaml index 064d10ea..2d2bed7c 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-minimal.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-minimal.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: enabled: true diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-pytest-extras.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-pytest-extras.yaml index 9c3ea5b9..2f984387 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-pytest-extras.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-pytest-extras.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: extraEnv: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-externally.yaml index 6d2b325f..f1bfbd0d 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-in-helm.yaml index 0e8c19c8..b36146d0 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: synapseSharedSecret: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-externally.yaml index 4ada8f6b..67b88dce 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: postgres: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-in-helm.yaml index 3b54463c..0404a59a 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: postgres: diff --git a/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres.yaml b/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres.yaml index 91291786..1a89cc40 100644 --- a/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres.yaml +++ b/charts/matrix-stack/ci/fragments/matrix-authentication-service-test-postgres.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only matrixAuthenticationService: postgres: diff --git a/charts/matrix-stack/ci/fragments/postgres-checkov.yaml b/charts/matrix-stack/ci/fragments/postgres-checkov.yaml index f2997ccf..361c3bc3 100644 --- a/charts/matrix-stack/ci/fragments/postgres-checkov.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-checkov.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: enabled: true diff --git a/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-externally.yaml index 767239b9..88f5e937 100644 --- a/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: essPasswords: diff --git a/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-in-helm.yaml index 6dd8779e..423a4e15 100644 --- a/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-matrix-authentication-service-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: essPasswords: diff --git a/charts/matrix-stack/ci/fragments/postgres-minimal.yaml b/charts/matrix-stack/ci/fragments/postgres-minimal.yaml index b11fdcbb..9c32ce15 100644 --- a/charts/matrix-stack/ci/fragments/postgres-minimal.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-minimal.yaml @@ -1,4 +1,4 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only diff --git a/charts/matrix-stack/ci/fragments/postgres-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/postgres-secrets-externally.yaml index 328ca1b3..9366275f 100644 --- a/charts/matrix-stack/ci/fragments/postgres-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: enabled: true diff --git a/charts/matrix-stack/ci/fragments/postgres-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/postgres-secrets-in-helm.yaml index 467a9759..fd8e9e2c 100644 --- a/charts/matrix-stack/ci/fragments/postgres-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: enabled: true diff --git a/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-externally.yaml index bebdc8ca..0db06d9a 100644 --- a/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: essPasswords: diff --git a/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-in-helm.yaml index 2a2b8e26..5061013f 100644 --- a/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/postgres-synapse-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only postgres: essPasswords: diff --git a/charts/matrix-stack/ci/fragments/quick-setup-all-enabled.yaml b/charts/matrix-stack/ci/fragments/quick-setup-all-enabled.yaml index 0daa3bd0..1fd1dedd 100644 --- a/charts/matrix-stack/ci/fragments/quick-setup-all-enabled.yaml +++ b/charts/matrix-stack/ci/fragments/quick-setup-all-enabled.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only elementWeb: enabled: true diff --git a/charts/matrix-stack/ci/fragments/quick-setup-certificates.yaml b/charts/matrix-stack/ci/fragments/quick-setup-certificates.yaml index 10e5c802..2513f7fb 100644 --- a/charts/matrix-stack/ci/fragments/quick-setup-certificates.yaml +++ b/charts/matrix-stack/ci/fragments/quick-setup-certificates.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only elementWeb: ingress: diff --git a/charts/matrix-stack/ci/fragments/quick-setup-hostnames.yaml b/charts/matrix-stack/ci/fragments/quick-setup-hostnames.yaml index 646a2023..90017468 100644 --- a/charts/matrix-stack/ci/fragments/quick-setup-hostnames.yaml +++ b/charts/matrix-stack/ci/fragments/quick-setup-hostnames.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only elementWeb: ingress: diff --git a/charts/matrix-stack/ci/fragments/quick-setup-letsencrypt.yaml b/charts/matrix-stack/ci/fragments/quick-setup-letsencrypt.yaml index 6c438a7c..193799b2 100644 --- a/charts/matrix-stack/ci/fragments/quick-setup-letsencrypt.yaml +++ b/charts/matrix-stack/ci/fragments/quick-setup-letsencrypt.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only certManager: clusterIssuer: letsencrypt-prod diff --git a/charts/matrix-stack/ci/fragments/quick-setup-postgresql.yaml b/charts/matrix-stack/ci/fragments/quick-setup-postgresql.yaml index bb66cf40..90feda49 100644 --- a/charts/matrix-stack/ci/fragments/quick-setup-postgresql.yaml +++ b/charts/matrix-stack/ci/fragments/quick-setup-postgresql.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: postgres: diff --git a/charts/matrix-stack/ci/fragments/quick-setup-wildcard-cert.yaml b/charts/matrix-stack/ci/fragments/quick-setup-wildcard-cert.yaml index 31142e94..80c9fea0 100644 --- a/charts/matrix-stack/ci/fragments/quick-setup-wildcard-cert.yaml +++ b/charts/matrix-stack/ci/fragments/quick-setup-wildcard-cert.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only ingress: tlsSecret: ess-certificate diff --git a/charts/matrix-stack/ci/fragments/synapse-all-workers-running.yaml b/charts/matrix-stack/ci/fragments/synapse-all-workers-running.yaml index 709f457a..840b8489 100644 --- a/charts/matrix-stack/ci/fragments/synapse-all-workers-running.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-all-workers-running.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: workers: diff --git a/charts/matrix-stack/ci/fragments/synapse-checkov.yaml b/charts/matrix-stack/ci/fragments/synapse-checkov.yaml index f37a1b82..88d92032 100644 --- a/charts/matrix-stack/ci/fragments/synapse-checkov.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-checkov.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: annotations: diff --git a/charts/matrix-stack/ci/fragments/synapse-ingress-additional-paths.yaml b/charts/matrix-stack/ci/fragments/synapse-ingress-additional-paths.yaml index 37e1862b..a59063de 100644 --- a/charts/matrix-stack/ci/fragments/synapse-ingress-additional-paths.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-ingress-additional-paths.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: ingress: diff --git a/charts/matrix-stack/ci/fragments/synapse-minimal.yaml b/charts/matrix-stack/ci/fragments/synapse-minimal.yaml index 7f4e5da8..fdd9541c 100644 --- a/charts/matrix-stack/ci/fragments/synapse-minimal.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-minimal.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # The secrets listed here are ones that `initSecrets` can't generate yet. # Postgres details are also required but this fragment will be combined with diff --git a/charts/matrix-stack/ci/fragments/synapse-pytest-base-extras.yaml b/charts/matrix-stack/ci/fragments/synapse-pytest-base-extras.yaml index 200e524c..5a7fda31 100644 --- a/charts/matrix-stack/ci/fragments/synapse-pytest-base-extras.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-pytest-base-extras.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: ingress: diff --git a/charts/matrix-stack/ci/fragments/synapse-pytest-self-extras.yaml b/charts/matrix-stack/ci/fragments/synapse-pytest-self-extras.yaml index d38f3a65..e94e8587 100644 --- a/charts/matrix-stack/ci/fragments/synapse-pytest-self-extras.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-pytest-self-extras.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: additional: diff --git a/charts/matrix-stack/ci/fragments/synapse-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/synapse-secrets-externally.yaml index 581b3cc0..4b6a051e 100644 --- a/charts/matrix-stack/ci/fragments/synapse-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: registrationSharedSecret: diff --git a/charts/matrix-stack/ci/fragments/synapse-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/synapse-secrets-in-helm.yaml index 97d1a294..7c93f7a1 100644 --- a/charts/matrix-stack/ci/fragments/synapse-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: registrationSharedSecret: diff --git a/charts/matrix-stack/ci/fragments/synapse-some-workers-running.yaml b/charts/matrix-stack/ci/fragments/synapse-some-workers-running.yaml index c1b32fc1..0598b12f 100644 --- a/charts/matrix-stack/ci/fragments/synapse-some-workers-running.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-some-workers-running.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: workers: diff --git a/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-externally.yaml b/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-externally.yaml index 2a251c32..0a8c0e3c 100644 --- a/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-externally.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-externally.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: postgres: diff --git a/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-in-helm.yaml b/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-in-helm.yaml index 1ded19cb..50ef1376 100644 --- a/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-in-helm.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-test-postgres-secrets-in-helm.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: postgres: diff --git a/charts/matrix-stack/ci/fragments/synapse-test-postgres.yaml b/charts/matrix-stack/ci/fragments/synapse-test-postgres.yaml index f6099f02..861052e3 100644 --- a/charts/matrix-stack/ci/fragments/synapse-test-postgres.yaml +++ b/charts/matrix-stack/ci/fragments/synapse-test-postgres.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only synapse: postgres: diff --git a/charts/matrix-stack/ci/fragments/well-known-minimal.yaml b/charts/matrix-stack/ci/fragments/well-known-minimal.yaml index d6734028..ca4167c5 100644 --- a/charts/matrix-stack/ci/fragments/well-known-minimal.yaml +++ b/charts/matrix-stack/ci/fragments/well-known-minimal.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only serverName: ess.localhost diff --git a/charts/matrix-stack/ci/fragments/well-known-pytest-extras.yaml b/charts/matrix-stack/ci/fragments/well-known-pytest-extras.yaml index cfd72b8e..c0259e83 100644 --- a/charts/matrix-stack/ci/fragments/well-known-pytest-extras.yaml +++ b/charts/matrix-stack/ci/fragments/well-known-pytest-extras.yaml @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only global: baseDomain: ess.localhost diff --git a/charts/matrix-stack/ci/matrix-authentication-service-checkov-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-checkov-values.yaml index 129bd9ff..9955f4de 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-checkov-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-checkov-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-checkov.yaml init-secrets-minimal.yaml init-secrets-checkov.yaml postgres-minimal.yaml postgres-checkov.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/matrix-authentication-service-external-synapse-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-external-synapse-values.yaml index 949d1591..3cf77c96 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-external-synapse-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-external-synapse-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-external-synapse.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/matrix-authentication-service-minimal-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-minimal-values.yaml index 29d8fc80..933b71fe 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-minimal-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-minimal-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-externally-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-externally-values.yaml index 0640641e..191b88fb 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-externally-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-externally-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-secrets-externally.yaml postgres-secrets-externally.yaml postgres-matrix-authentication-service-secrets-externally.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-in-helm-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-in-helm-values.yaml index 0b6d01af..acafb953 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-in-helm-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-in-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-secrets-externally.yaml postgres-secrets-in-helm.yaml postgres-matrix-authentication-service-secrets-in-helm.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/matrix-authentication-service-secrets-externally-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-secrets-externally-values.yaml index 4328f80e..b9a22b4a 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-secrets-externally-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-secrets-externally-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-test-postgres.yaml matrix-authentication-service-test-postgres-secrets-externally.yaml matrix-authentication-service-secrets-externally.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/matrix-authentication-service-secrets-in-helm-values.yaml b/charts/matrix-stack/ci/matrix-authentication-service-secrets-in-helm-values.yaml index 0f6d65c2..8daf6665 100644 --- a/charts/matrix-stack/ci/matrix-authentication-service-secrets-in-helm-values.yaml +++ b/charts/matrix-stack/ci/matrix-authentication-service-secrets-in-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-test-postgres.yaml matrix-authentication-service-test-postgres-secrets-in-helm.yaml matrix-authentication-service-secrets-in-helm.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/nothing-enabled-values.yaml b/charts/matrix-stack/ci/nothing-enabled-values.yaml index 7ce6d1a1..a5b12f9f 100644 --- a/charts/matrix-stack/ci/nothing-enabled-values.yaml +++ b/charts/matrix-stack/ci/nothing-enabled-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only elementWeb: enabled: false diff --git a/charts/matrix-stack/ci/pytest-element-web-values.yaml b/charts/matrix-stack/ci/pytest-element-web-values.yaml index dc6e0243..68de17f5 100644 --- a/charts/matrix-stack/ci/pytest-element-web-values.yaml +++ b/charts/matrix-stack/ci/pytest-element-web-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: element-web-minimal.yaml element-web-pytest-extras.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/pytest-matrix-authentication-service-values.yaml b/charts/matrix-stack/ci/pytest-matrix-authentication-service-values.yaml index cc0f38fb..74b1dd71 100644 --- a/charts/matrix-stack/ci/pytest-matrix-authentication-service-values.yaml +++ b/charts/matrix-stack/ci/pytest-matrix-authentication-service-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-pytest-base-extras.yaml matrix-authentication-service-minimal.yaml matrix-authentication-service-pytest-extras.yaml init-secrets-minimal.yaml init-secrets-pytest-extras.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/pytest-synapse-values.yaml b/charts/matrix-stack/ci/pytest-synapse-values.yaml index 989373f0..dcd52bc7 100644 --- a/charts/matrix-stack/ci/pytest-synapse-values.yaml +++ b/charts/matrix-stack/ci/pytest-synapse-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-pytest-base-extras.yaml synapse-pytest-self-extras.yaml init-secrets-minimal.yaml init-secrets-pytest-extras.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/pytest-well-known-values.yaml b/charts/matrix-stack/ci/pytest-well-known-values.yaml index 44866b78..049cfb62 100644 --- a/charts/matrix-stack/ci/pytest-well-known-values.yaml +++ b/charts/matrix-stack/ci/pytest-well-known-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml well-known-pytest-extras.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/quick-setup-certificates-pg-external-values.yaml b/charts/matrix-stack/ci/quick-setup-certificates-pg-external-values.yaml index e37f692a..32c80e2b 100644 --- a/charts/matrix-stack/ci/quick-setup-certificates-pg-external-values.yaml +++ b/charts/matrix-stack/ci/quick-setup-certificates-pg-external-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: quick-setup-all-enabled.yaml quick-setup-hostnames.yaml quick-setup-certificates.yaml quick-setup-postgresql.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/quick-setup-certificates-pg-with-helm-values.yaml b/charts/matrix-stack/ci/quick-setup-certificates-pg-with-helm-values.yaml index 534abc15..2f2e09e5 100644 --- a/charts/matrix-stack/ci/quick-setup-certificates-pg-with-helm-values.yaml +++ b/charts/matrix-stack/ci/quick-setup-certificates-pg-with-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: quick-setup-all-enabled.yaml quick-setup-hostnames.yaml quick-setup-certificates.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-external-values.yaml b/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-external-values.yaml index 7d8b6fc4..a4ea662c 100644 --- a/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-external-values.yaml +++ b/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-external-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: quick-setup-all-enabled.yaml quick-setup-hostnames.yaml quick-setup-letsencrypt.yaml quick-setup-postgresql.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-with-helm-values.yaml b/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-with-helm-values.yaml index a9410a75..94dd4acf 100644 --- a/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-with-helm-values.yaml +++ b/charts/matrix-stack/ci/quick-setup-letsencrypt-pg-with-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: quick-setup-all-enabled.yaml quick-setup-hostnames.yaml quick-setup-letsencrypt.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-external-values.yaml b/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-external-values.yaml index 8b93d814..e6593993 100644 --- a/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-external-values.yaml +++ b/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-external-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: quick-setup-all-enabled.yaml quick-setup-hostnames.yaml quick-setup-wildcard-cert.yaml quick-setup-postgresql.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-with-helm-values.yaml b/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-with-helm-values.yaml index 5efaa48f..24d72f0a 100644 --- a/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-with-helm-values.yaml +++ b/charts/matrix-stack/ci/quick-setup-wildcard-cert-pg-with-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: quick-setup-all-enabled.yaml quick-setup-hostnames.yaml quick-setup-wildcard-cert.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-checkov-with-workers-values.yaml b/charts/matrix-stack/ci/synapse-checkov-with-workers-values.yaml index cf383af5..9bef8902 100644 --- a/charts/matrix-stack/ci/synapse-checkov-with-workers-values.yaml +++ b/charts/matrix-stack/ci/synapse-checkov-with-workers-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-some-workers-running.yaml synapse-checkov.yaml haproxy-checkov.yaml init-secrets-minimal.yaml init-secrets-checkov.yaml postgres-minimal.yaml postgres-checkov.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-ingress-additional-paths-values.yaml b/charts/matrix-stack/ci/synapse-ingress-additional-paths-values.yaml index 0df5758c..b4a39f9d 100644 --- a/charts/matrix-stack/ci/synapse-ingress-additional-paths-values.yaml +++ b/charts/matrix-stack/ci/synapse-ingress-additional-paths-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-ingress-additional-paths.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-minimal-values.yaml b/charts/matrix-stack/ci/synapse-minimal-values.yaml index e76a4294..ac1f4162 100644 --- a/charts/matrix-stack/ci/synapse-minimal-values.yaml +++ b/charts/matrix-stack/ci/synapse-minimal-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-postgres-secrets-externally-values.yaml b/charts/matrix-stack/ci/synapse-postgres-secrets-externally-values.yaml index 57db98f6..51a7fee6 100644 --- a/charts/matrix-stack/ci/synapse-postgres-secrets-externally-values.yaml +++ b/charts/matrix-stack/ci/synapse-postgres-secrets-externally-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-secrets-externally.yaml postgres-secrets-externally.yaml postgres-synapse-secrets-externally.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-postgres-secrets-in-helm-values.yaml b/charts/matrix-stack/ci/synapse-postgres-secrets-in-helm-values.yaml index 3d5bf067..bd838344 100644 --- a/charts/matrix-stack/ci/synapse-postgres-secrets-in-helm-values.yaml +++ b/charts/matrix-stack/ci/synapse-postgres-secrets-in-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-secrets-in-helm.yaml postgres-secrets-in-helm.yaml postgres-synapse-secrets-in-helm.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-secrets-externally-values.yaml b/charts/matrix-stack/ci/synapse-secrets-externally-values.yaml index 29d84aa5..72f9ca19 100644 --- a/charts/matrix-stack/ci/synapse-secrets-externally-values.yaml +++ b/charts/matrix-stack/ci/synapse-secrets-externally-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-test-postgres.yaml synapse-test-postgres-secrets-externally.yaml synapse-secrets-externally.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-secrets-in-helm-values.yaml b/charts/matrix-stack/ci/synapse-secrets-in-helm-values.yaml index 59002438..acbb05b1 100644 --- a/charts/matrix-stack/ci/synapse-secrets-in-helm-values.yaml +++ b/charts/matrix-stack/ci/synapse-secrets-in-helm-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-test-postgres.yaml synapse-test-postgres-secrets-in-helm.yaml synapse-secrets-in-helm.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/synapse-worker-example-values.yaml b/charts/matrix-stack/ci/synapse-worker-example-values.yaml index 21e770fd..f59fa473 100644 --- a/charts/matrix-stack/ci/synapse-worker-example-values.yaml +++ b/charts/matrix-stack/ci/synapse-worker-example-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: synapse-minimal.yaml synapse-all-workers-running.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/test-cluster-mixin.yaml b/charts/matrix-stack/ci/test-cluster-mixin.yaml index 70ed26ce..438c176c 100644 --- a/charts/matrix-stack/ci/test-cluster-mixin.yaml +++ b/charts/matrix-stack/ci/test-cluster-mixin.yaml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # This value file is not complete on its own. # It is a mixin to be used with other values file to enable diff --git a/charts/matrix-stack/ci/well-known-checkov-values.yaml b/charts/matrix-stack/ci/well-known-checkov-values.yaml index 9125623b..d3da5f1a 100644 --- a/charts/matrix-stack/ci/well-known-checkov-values.yaml +++ b/charts/matrix-stack/ci/well-known-checkov-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml haproxy-checkov.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/well-known-element-web-values.yaml b/charts/matrix-stack/ci/well-known-element-web-values.yaml index 8985d961..e492b5ca 100644 --- a/charts/matrix-stack/ci/well-known-element-web-values.yaml +++ b/charts/matrix-stack/ci/well-known-element-web-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml element-web-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/well-known-mas-values.yaml b/charts/matrix-stack/ci/well-known-mas-values.yaml index c8a8e052..98316056 100644 --- a/charts/matrix-stack/ci/well-known-mas-values.yaml +++ b/charts/matrix-stack/ci/well-known-mas-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml matrix-authentication-service-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/well-known-minimal-values.yaml b/charts/matrix-stack/ci/well-known-minimal-values.yaml index 4e985767..8f7d01bf 100644 --- a/charts/matrix-stack/ci/well-known-minimal-values.yaml +++ b/charts/matrix-stack/ci/well-known-minimal-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/well-known-synapse-mas-values.yaml b/charts/matrix-stack/ci/well-known-synapse-mas-values.yaml index 30df7595..c4fbf6a3 100644 --- a/charts/matrix-stack/ci/well-known-synapse-mas-values.yaml +++ b/charts/matrix-stack/ci/well-known-synapse-mas-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml synapse-minimal.yaml matrix-authentication-service-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/ci/well-known-synapse-values.yaml b/charts/matrix-stack/ci/well-known-synapse-values.yaml index cd2378dc..0f35aabb 100644 --- a/charts/matrix-stack/ci/well-known-synapse-values.yaml +++ b/charts/matrix-stack/ci/well-known-synapse-values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # source_fragments: well-known-minimal.yaml synapse-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml # DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values diff --git a/charts/matrix-stack/configs/haproxy/haproxy.cfg.tpl b/charts/matrix-stack/configs/haproxy/haproxy.cfg.tpl index 5cbf980c..e7a1b71b 100644 --- a/charts/matrix-stack/configs/haproxy/haproxy.cfg.tpl +++ b/charts/matrix-stack/configs/haproxy/haproxy.cfg.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- $root := .root -}} diff --git a/charts/matrix-stack/configs/matrix-authentication-service/config.yaml.tpl b/charts/matrix-stack/configs/matrix-authentication-service/config.yaml.tpl index 0b649fe5..2449fac5 100644 --- a/charts/matrix-stack/configs/matrix-authentication-service/config.yaml.tpl +++ b/charts/matrix-stack/configs/matrix-authentication-service/config.yaml.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- $root := .root }} diff --git a/charts/matrix-stack/configs/synapse/partial-haproxy.cfg.tpl b/charts/matrix-stack/configs/synapse/partial-haproxy.cfg.tpl index 7c9ff92b..9cad69de 100644 --- a/charts/matrix-stack/configs/synapse/partial-haproxy.cfg.tpl +++ b/charts/matrix-stack/configs/synapse/partial-haproxy.cfg.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- $root := .root -}} diff --git a/charts/matrix-stack/configs/well-known/partial-haproxy.cfg.tpl b/charts/matrix-stack/configs/well-known/partial-haproxy.cfg.tpl index b2636101..b440b7d3 100644 --- a/charts/matrix-stack/configs/well-known/partial-haproxy.cfg.tpl +++ b/charts/matrix-stack/configs/well-known/partial-haproxy.cfg.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- $root := .root -}} diff --git a/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 b/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 index d4fdc310..b1fee853 100644 --- a/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 +++ b/charts/matrix-stack/source/common/sub_schema_values.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% macro generatedFileWarning() %} diff --git a/charts/matrix-stack/source/element-web.yaml.j2 b/charts/matrix-stack/source/element-web.yaml.j2 index 9b439d23..6e112a88 100644 --- a/charts/matrix-stack/source/element-web.yaml.j2 +++ b/charts/matrix-stack/source/element-web.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024-2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} diff --git a/charts/matrix-stack/source/haproxy.yaml.j2 b/charts/matrix-stack/source/haproxy.yaml.j2 index edaec46c..df9df6f9 100644 --- a/charts/matrix-stack/source/haproxy.yaml.j2 +++ b/charts/matrix-stack/source/haproxy.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024-2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% import 'sub_schema_values.yaml.j2' as sub_schema_values -%} diff --git a/charts/matrix-stack/source/init-secrets.yaml.j2 b/charts/matrix-stack/source/init-secrets.yaml.j2 index 8dc254d8..8eb55d55 100644 --- a/charts/matrix-stack/source/init-secrets.yaml.j2 +++ b/charts/matrix-stack/source/init-secrets.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% import 'sub_schema_values.yaml.j2' as sub_schema_values -%} diff --git a/charts/matrix-stack/source/matrixAuthenticationService.yaml.j2 b/charts/matrix-stack/source/matrixAuthenticationService.yaml.j2 index f075859b..e5ec38ae 100644 --- a/charts/matrix-stack/source/matrixAuthenticationService.yaml.j2 +++ b/charts/matrix-stack/source/matrixAuthenticationService.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% import "common/sub_schema_values.yaml.j2" as sub_schema_values %} diff --git a/charts/matrix-stack/source/postgres.yaml.j2 b/charts/matrix-stack/source/postgres.yaml.j2 index f419e4a2..0fade896 100644 --- a/charts/matrix-stack/source/postgres.yaml.j2 +++ b/charts/matrix-stack/source/postgres.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} enabled: true diff --git a/charts/matrix-stack/source/synapse.yaml.j2 b/charts/matrix-stack/source/synapse.yaml.j2 index 54a6d124..0d88d394 100644 --- a/charts/matrix-stack/source/synapse.yaml.j2 +++ b/charts/matrix-stack/source/synapse.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% import 'sub_schema_values.yaml.j2' as sub_schema_values -%} diff --git a/charts/matrix-stack/source/synapse/synapse_sub_schema_values.yaml.j2 b/charts/matrix-stack/source/synapse/synapse_sub_schema_values.yaml.j2 index 3afe4d9d..f871d1be 100644 --- a/charts/matrix-stack/source/synapse/synapse_sub_schema_values.yaml.j2 +++ b/charts/matrix-stack/source/synapse/synapse_sub_schema_values.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% macro single_worker(workerType) %} diff --git a/charts/matrix-stack/source/values.yaml.j2 b/charts/matrix-stack/source/values.yaml.j2 index 85d2c66e..cd5999a2 100644 --- a/charts/matrix-stack/source/values.yaml.j2 +++ b/charts/matrix-stack/source/values.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% import 'sub_schema_values.yaml.j2' as sub_schema_values -%} diff --git a/charts/matrix-stack/source/wellKnownDelegation.yaml.j2 b/charts/matrix-stack/source/wellKnownDelegation.yaml.j2 index 400f24c4..0d848886 100644 --- a/charts/matrix-stack/source/wellKnownDelegation.yaml.j2 +++ b/charts/matrix-stack/source/wellKnownDelegation.yaml.j2 @@ -1,7 +1,7 @@ {# Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only #} {% import 'sub_schema_values.yaml.j2' as sub_schema_values -%} diff --git a/charts/matrix-stack/templates/element-web/_helpers.tpl b/charts/matrix-stack/templates/element-web/_helpers.tpl index 2490cc53..e24f2fea 100644 --- a/charts/matrix-stack/templates/element-web/_helpers.tpl +++ b/charts/matrix-stack/templates/element-web/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.element-web.labels" -}} diff --git a/charts/matrix-stack/templates/element-web/configmap.yaml b/charts/matrix-stack/templates/element-web/configmap.yaml index 4ebdc1dd..aa7084c5 100644 --- a/charts/matrix-stack/templates/element-web/configmap.yaml +++ b/charts/matrix-stack/templates/element-web/configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.elementWeb -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/element-web/deployment.yaml b/charts/matrix-stack/templates/element-web/deployment.yaml index daaa4c6f..848baafc 100644 --- a/charts/matrix-stack/templates/element-web/deployment.yaml +++ b/charts/matrix-stack/templates/element-web/deployment.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.elementWeb -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/element-web/ingress.yaml b/charts/matrix-stack/templates/element-web/ingress.yaml index c2fbddcd..78db9821 100644 --- a/charts/matrix-stack/templates/element-web/ingress.yaml +++ b/charts/matrix-stack/templates/element-web/ingress.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.elementWeb -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/element-web/nginx_configmap.yaml b/charts/matrix-stack/templates/element-web/nginx_configmap.yaml index beff28b6..1a94eb6f 100644 --- a/charts/matrix-stack/templates/element-web/nginx_configmap.yaml +++ b/charts/matrix-stack/templates/element-web/nginx_configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.elementWeb -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/element-web/service.yaml b/charts/matrix-stack/templates/element-web/service.yaml index 29be36a3..fb402f97 100644 --- a/charts/matrix-stack/templates/element-web/service.yaml +++ b/charts/matrix-stack/templates/element-web/service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.elementWeb -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/element-web/serviceaccount.yaml b/charts/matrix-stack/templates/element-web/serviceaccount.yaml index dfab1ce1..c6001601 100644 --- a/charts/matrix-stack/templates/element-web/serviceaccount.yaml +++ b/charts/matrix-stack/templates/element-web/serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.elementWeb -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/ess-library/_credentials.tpl b/charts/matrix-stack/templates/ess-library/_credentials.tpl index 44f4aa3c..a0edb7fc 100644 --- a/charts/matrix-stack/templates/ess-library/_credentials.tpl +++ b/charts/matrix-stack/templates/ess-library/_credentials.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024-2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- /* Returns the value (or nill) encoded as JSON at the given dot seperated path in the values file */ -}} diff --git a/charts/matrix-stack/templates/ess-library/_ingress.tpl b/charts/matrix-stack/templates/ess-library/_ingress.tpl index be3f4fd6..3f1dd52b 100644 --- a/charts/matrix-stack/templates/ess-library/_ingress.tpl +++ b/charts/matrix-stack/templates/ess-library/_ingress.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.ess-library.ingress.annotations" -}} diff --git a/charts/matrix-stack/templates/ess-library/_labels.tpl b/charts/matrix-stack/templates/ess-library/_labels.tpl index c258fc62..403a1e59 100644 --- a/charts/matrix-stack/templates/ess-library/_labels.tpl +++ b/charts/matrix-stack/templates/ess-library/_labels.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.ess-library.labels.common" -}} diff --git a/charts/matrix-stack/templates/ess-library/_pods.tpl b/charts/matrix-stack/templates/ess-library/_pods.tpl index 77662190..5626b747 100644 --- a/charts/matrix-stack/templates/ess-library/_pods.tpl +++ b/charts/matrix-stack/templates/ess-library/_pods.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.ess-library.pods.commonSpec" -}} diff --git a/charts/matrix-stack/templates/ess-library/_postgres.tpl b/charts/matrix-stack/templates/ess-library/_postgres.tpl index 8640efae..fd757739 100644 --- a/charts/matrix-stack/templates/ess-library/_postgres.tpl +++ b/charts/matrix-stack/templates/ess-library/_postgres.tpl @@ -2,7 +2,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} diff --git a/charts/matrix-stack/templates/ess-library/_serviceAccounts.tpl b/charts/matrix-stack/templates/ess-library/_serviceAccounts.tpl index 9bbb1446..a0e15685 100644 --- a/charts/matrix-stack/templates/ess-library/_serviceAccounts.tpl +++ b/charts/matrix-stack/templates/ess-library/_serviceAccounts.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.ess-library.serviceAccountName" -}} diff --git a/charts/matrix-stack/templates/haproxy/_helpers.tpl b/charts/matrix-stack/templates/haproxy/_helpers.tpl index 690fb84e..2a086264 100644 --- a/charts/matrix-stack/templates/haproxy/_helpers.tpl +++ b/charts/matrix-stack/templates/haproxy/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.haproxy.labels" -}} diff --git a/charts/matrix-stack/templates/haproxy/configmap.yaml b/charts/matrix-stack/templates/haproxy/configmap.yaml index 8fa985e0..16125979 100644 --- a/charts/matrix-stack/templates/haproxy/configmap.yaml +++ b/charts/matrix-stack/templates/haproxy/configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- if or $.Values.synapse.enabled $.Values.wellKnownDelegation.enabled -}} diff --git a/charts/matrix-stack/templates/haproxy/deployment.yaml b/charts/matrix-stack/templates/haproxy/deployment.yaml index 7033ae8e..fbe700d6 100644 --- a/charts/matrix-stack/templates/haproxy/deployment.yaml +++ b/charts/matrix-stack/templates/haproxy/deployment.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} diff --git a/charts/matrix-stack/templates/haproxy/service.yaml b/charts/matrix-stack/templates/haproxy/service.yaml index cbd11930..2365067d 100644 --- a/charts/matrix-stack/templates/haproxy/service.yaml +++ b/charts/matrix-stack/templates/haproxy/service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- if or $.Values.synapse.enabled $.Values.wellKnownDelegation.enabled -}} diff --git a/charts/matrix-stack/templates/haproxy/service_monitor.yaml b/charts/matrix-stack/templates/haproxy/service_monitor.yaml index 69d29f92..f542eb49 100644 --- a/charts/matrix-stack/templates/haproxy/service_monitor.yaml +++ b/charts/matrix-stack/templates/haproxy/service_monitor.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- if or $.Values.synapse.enabled $.Values.wellKnownDelegation.enabled -}} diff --git a/charts/matrix-stack/templates/haproxy/serviceaccount.yaml b/charts/matrix-stack/templates/haproxy/serviceaccount.yaml index 9dd181b8..f5ebd503 100644 --- a/charts/matrix-stack/templates/haproxy/serviceaccount.yaml +++ b/charts/matrix-stack/templates/haproxy/serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- if or $.Values.synapse.enabled $.Values.wellKnownDelegation.enabled -}} diff --git a/charts/matrix-stack/templates/init-secrets/_helpers.tpl b/charts/matrix-stack/templates/init-secrets/_helpers.tpl index 89601de8..7187638f 100644 --- a/charts/matrix-stack/templates/init-secrets/_helpers.tpl +++ b/charts/matrix-stack/templates/init-secrets/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.init-secrets.labels" -}} diff --git a/charts/matrix-stack/templates/init-secrets/job.yaml b/charts/matrix-stack/templates/init-secrets/job.yaml index 4ae73c15..cca0fb43 100644 --- a/charts/matrix-stack/templates/init-secrets/job.yaml +++ b/charts/matrix-stack/templates/init-secrets/job.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.initSecrets -}} diff --git a/charts/matrix-stack/templates/init-secrets/role.yaml b/charts/matrix-stack/templates/init-secrets/role.yaml index aad533f5..c58b5834 100644 --- a/charts/matrix-stack/templates/init-secrets/role.yaml +++ b/charts/matrix-stack/templates/init-secrets/role.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.initSecrets -}} {{- if and .enabled .rbac.create (include "element-io.init-secrets.generated-secrets" (dict "root" $)) -}} diff --git a/charts/matrix-stack/templates/init-secrets/rolebinding.yaml b/charts/matrix-stack/templates/init-secrets/rolebinding.yaml index 6d29284c..8f56efa1 100644 --- a/charts/matrix-stack/templates/init-secrets/rolebinding.yaml +++ b/charts/matrix-stack/templates/init-secrets/rolebinding.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.initSecrets -}} diff --git a/charts/matrix-stack/templates/init-secrets/serviceaccount.yaml b/charts/matrix-stack/templates/init-secrets/serviceaccount.yaml index 020fb7e6..e03d12d2 100644 --- a/charts/matrix-stack/templates/init-secrets/serviceaccount.yaml +++ b/charts/matrix-stack/templates/init-secrets/serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.initSecrets -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/_helpers.tpl b/charts/matrix-stack/templates/matrix-authentication-service/_helpers.tpl index f2882bb2..19f2b169 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/_helpers.tpl +++ b/charts/matrix-stack/templates/matrix-authentication-service/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.matrix-authentication-service.labels" -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/configmap.yaml b/charts/matrix-stack/templates/matrix-authentication-service/configmap.yaml index dfe64b28..2fcf7a6f 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/configmap.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/deployment.yaml b/charts/matrix-stack/templates/matrix-authentication-service/deployment.yaml index 36051baf..92233af9 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/deployment.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/deployment.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml b/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml index 0091de40..2af5b9ff 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/ingress.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/secret.yaml b/charts/matrix-stack/templates/matrix-authentication-service/secret.yaml index b50e4305..84b88baa 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/secret.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/secret.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/service.yaml b/charts/matrix-stack/templates/matrix-authentication-service/service.yaml index 19e40bb3..2bc31238 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/service.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/service_monitor.yaml b/charts/matrix-stack/templates/matrix-authentication-service/service_monitor.yaml index 179e0b8c..f4099b96 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/service_monitor.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/service_monitor.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} diff --git a/charts/matrix-stack/templates/matrix-authentication-service/serviceaccount.yaml b/charts/matrix-stack/templates/matrix-authentication-service/serviceaccount.yaml index 360b11a5..54da2cde 100644 --- a/charts/matrix-stack/templates/matrix-authentication-service/serviceaccount.yaml +++ b/charts/matrix-stack/templates/matrix-authentication-service/serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.matrixAuthenticationService -}} {{- if .enabled -}} diff --git a/charts/matrix-stack/templates/postgres/_helpers.tpl b/charts/matrix-stack/templates/postgres/_helpers.tpl index 9deb48bf..460b92eb 100644 --- a/charts/matrix-stack/templates/postgres/_helpers.tpl +++ b/charts/matrix-stack/templates/postgres/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.postgres.labels" -}} diff --git a/charts/matrix-stack/templates/postgres/_postgres_secret.tpl b/charts/matrix-stack/templates/postgres/_postgres_secret.tpl index d057bed4..348c8805 100644 --- a/charts/matrix-stack/templates/postgres/_postgres_secret.tpl +++ b/charts/matrix-stack/templates/postgres/_postgres_secret.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.postgres.secret-name" }} diff --git a/charts/matrix-stack/templates/postgres/configmap.yaml b/charts/matrix-stack/templates/postgres/configmap.yaml index 8b3bcd9a..e101a339 100644 --- a/charts/matrix-stack/templates/postgres/configmap.yaml +++ b/charts/matrix-stack/templates/postgres/configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres }} diff --git a/charts/matrix-stack/templates/postgres/pvc.yaml b/charts/matrix-stack/templates/postgres/pvc.yaml index 73819c2b..89ea2463 100644 --- a/charts/matrix-stack/templates/postgres/pvc.yaml +++ b/charts/matrix-stack/templates/postgres/pvc.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres -}} diff --git a/charts/matrix-stack/templates/postgres/secret.yaml b/charts/matrix-stack/templates/postgres/secret.yaml index 5fb1bb83..67709531 100644 --- a/charts/matrix-stack/templates/postgres/secret.yaml +++ b/charts/matrix-stack/templates/postgres/secret.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres -}} diff --git a/charts/matrix-stack/templates/postgres/secret_hook.yaml b/charts/matrix-stack/templates/postgres/secret_hook.yaml index 3c89459b..a56e3b01 100644 --- a/charts/matrix-stack/templates/postgres/secret_hook.yaml +++ b/charts/matrix-stack/templates/postgres/secret_hook.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres -}} diff --git a/charts/matrix-stack/templates/postgres/service.yaml b/charts/matrix-stack/templates/postgres/service.yaml index 0240e23e..465ca682 100644 --- a/charts/matrix-stack/templates/postgres/service.yaml +++ b/charts/matrix-stack/templates/postgres/service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres -}} diff --git a/charts/matrix-stack/templates/postgres/service_monitor.yaml b/charts/matrix-stack/templates/postgres/service_monitor.yaml index c9864fd5..5fb08318 100644 --- a/charts/matrix-stack/templates/postgres/service_monitor.yaml +++ b/charts/matrix-stack/templates/postgres/service_monitor.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.postgres -}} diff --git a/charts/matrix-stack/templates/postgres/serviceaccount.yaml b/charts/matrix-stack/templates/postgres/serviceaccount.yaml index 9a462e27..de3ebeb4 100644 --- a/charts/matrix-stack/templates/postgres/serviceaccount.yaml +++ b/charts/matrix-stack/templates/postgres/serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres -}} {{- if (include "element-io.postgres.enabled" (dict "root" $)) }} diff --git a/charts/matrix-stack/templates/postgres/statefulset.yaml b/charts/matrix-stack/templates/postgres/statefulset.yaml index d89de8fe..5826791f 100644 --- a/charts/matrix-stack/templates/postgres/statefulset.yaml +++ b/charts/matrix-stack/templates/postgres/statefulset.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.postgres -}} {{- if (include "element-io.postgres.enabled" (dict "root" $)) }} diff --git a/charts/matrix-stack/templates/synapse/_helpers.tpl b/charts/matrix-stack/templates/synapse/_helpers.tpl index 5ec6335e..a88291e6 100644 --- a/charts/matrix-stack/templates/synapse/_helpers.tpl +++ b/charts/matrix-stack/templates/synapse/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.synapse.labels" -}} diff --git a/charts/matrix-stack/templates/synapse/_synapse_config.tpl b/charts/matrix-stack/templates/synapse/_synapse_config.tpl index 5aa0864e..ab29f643 100644 --- a/charts/matrix-stack/templates/synapse/_synapse_config.tpl +++ b/charts/matrix-stack/templates/synapse/_synapse_config.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.synapse.config.shared-underrides" -}} diff --git a/charts/matrix-stack/templates/synapse/_synapse_configmap.tpl b/charts/matrix-stack/templates/synapse/_synapse_configmap.tpl index 6feeab7e..ddad10fe 100644 --- a/charts/matrix-stack/templates/synapse/_synapse_configmap.tpl +++ b/charts/matrix-stack/templates/synapse/_synapse_configmap.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.synapse.configmap-name" }} diff --git a/charts/matrix-stack/templates/synapse/_synapse_details.tpl b/charts/matrix-stack/templates/synapse/_synapse_details.tpl index c4f5baa9..9127afca 100644 --- a/charts/matrix-stack/templates/synapse/_synapse_details.tpl +++ b/charts/matrix-stack/templates/synapse/_synapse_details.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.synapse.process.hasHttp" -}} diff --git a/charts/matrix-stack/templates/synapse/_synapse_pod.tpl b/charts/matrix-stack/templates/synapse/_synapse_pod.tpl index 696dbcf3..1b2f5c96 100644 --- a/charts/matrix-stack/templates/synapse/_synapse_pod.tpl +++ b/charts/matrix-stack/templates/synapse/_synapse_pod.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.synapse.pod-template" }} diff --git a/charts/matrix-stack/templates/synapse/_synapse_secret.tpl b/charts/matrix-stack/templates/synapse/_synapse_secret.tpl index 873c6a0c..c21a5b6f 100644 --- a/charts/matrix-stack/templates/synapse/_synapse_secret.tpl +++ b/charts/matrix-stack/templates/synapse/_synapse_secret.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.synapse.secret-name" }} diff --git a/charts/matrix-stack/templates/synapse/redis_configmap.yaml b/charts/matrix-stack/templates/synapse/redis_configmap.yaml index b6bbd606..8f55a899 100644 --- a/charts/matrix-stack/templates/synapse/redis_configmap.yaml +++ b/charts/matrix-stack/templates/synapse/redis_configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/redis_deployment.yaml b/charts/matrix-stack/templates/synapse/redis_deployment.yaml index 5b995c09..4f40daae 100644 --- a/charts/matrix-stack/templates/synapse/redis_deployment.yaml +++ b/charts/matrix-stack/templates/synapse/redis_deployment.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/redis_service.yaml b/charts/matrix-stack/templates/synapse/redis_service.yaml index 9bec6b23..4cd67a26 100644 --- a/charts/matrix-stack/templates/synapse/redis_service.yaml +++ b/charts/matrix-stack/templates/synapse/redis_service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/redis_serviceaccount.yaml b/charts/matrix-stack/templates/synapse/redis_serviceaccount.yaml index 176a0508..024adf47 100644 --- a/charts/matrix-stack/templates/synapse/redis_serviceaccount.yaml +++ b/charts/matrix-stack/templates/synapse/redis_serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_check_config_job_hook.yaml b/charts/matrix-stack/templates/synapse/synapse_check_config_job_hook.yaml index caea9a9e..8f269180 100644 --- a/charts/matrix-stack/templates/synapse/synapse_check_config_job_hook.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_check_config_job_hook.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_configmap.yaml b/charts/matrix-stack/templates/synapse/synapse_configmap.yaml index ce40a27d..a5acff0a 100644 --- a/charts/matrix-stack/templates/synapse/synapse_configmap.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_configmap_hook.yaml b/charts/matrix-stack/templates/synapse/synapse_configmap_hook.yaml index 323b3f71..ecc43918 100644 --- a/charts/matrix-stack/templates/synapse/synapse_configmap_hook.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_configmap_hook.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_haproxy_configmap.yaml b/charts/matrix-stack/templates/synapse/synapse_haproxy_configmap.yaml index cb145ef8..06e639eb 100644 --- a/charts/matrix-stack/templates/synapse/synapse_haproxy_configmap.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_haproxy_configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- if $.Values.synapse.enabled -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_http_service.yaml b/charts/matrix-stack/templates/synapse/synapse_http_service.yaml index 78bc09fc..7b713d07 100644 --- a/charts/matrix-stack/templates/synapse/synapse_http_service.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_http_service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_ingress.yaml b/charts/matrix-stack/templates/synapse/synapse_ingress.yaml index 079ca2ab..f4600152 100644 --- a/charts/matrix-stack/templates/synapse/synapse_ingress.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_ingress.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_persistentvolumeclaim.yaml b/charts/matrix-stack/templates/synapse/synapse_persistentvolumeclaim.yaml index 0417be7e..6fb32c5c 100644 --- a/charts/matrix-stack/templates/synapse/synapse_persistentvolumeclaim.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_persistentvolumeclaim.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_secret.yaml b/charts/matrix-stack/templates/synapse/synapse_secret.yaml index 1b1cd1e1..9fb629cb 100644 --- a/charts/matrix-stack/templates/synapse/synapse_secret.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_secret.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024-2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_secret_hook.yaml b/charts/matrix-stack/templates/synapse/synapse_secret_hook.yaml index 6cb18c94..d9d95cbe 100644 --- a/charts/matrix-stack/templates/synapse/synapse_secret_hook.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_secret_hook.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_service.yaml b/charts/matrix-stack/templates/synapse/synapse_service.yaml index fa7cce36..0525a6ce 100644 --- a/charts/matrix-stack/templates/synapse/synapse_service.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_service_monitor.yaml b/charts/matrix-stack/templates/synapse/synapse_service_monitor.yaml index 444bcb76..cfcaf262 100644 --- a/charts/matrix-stack/templates/synapse/synapse_service_monitor.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_service_monitor.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_serviceaccount.yaml b/charts/matrix-stack/templates/synapse/synapse_serviceaccount.yaml index 00f121b9..2b6f8d5e 100644 --- a/charts/matrix-stack/templates/synapse/synapse_serviceaccount.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_serviceaccount.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_serviceaccount_hook.yaml b/charts/matrix-stack/templates/synapse/synapse_serviceaccount_hook.yaml index 1cf6e7ef..2e2ea559 100644 --- a/charts/matrix-stack/templates/synapse/synapse_serviceaccount_hook.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_serviceaccount_hook.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/synapse/synapse_statefulset.yaml b/charts/matrix-stack/templates/synapse/synapse_statefulset.yaml index bf97a28f..01abb37a 100644 --- a/charts/matrix-stack/templates/synapse/synapse_statefulset.yaml +++ b/charts/matrix-stack/templates/synapse/synapse_statefulset.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with .Values.synapse -}} diff --git a/charts/matrix-stack/templates/well-known/_helpers.tpl b/charts/matrix-stack/templates/well-known/_helpers.tpl index 923d2b6b..c7648a42 100644 --- a/charts/matrix-stack/templates/well-known/_helpers.tpl +++ b/charts/matrix-stack/templates/well-known/_helpers.tpl @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- define "element-io.well-known-delegation.labels" -}} diff --git a/charts/matrix-stack/templates/well-known/configmap.yaml b/charts/matrix-stack/templates/well-known/configmap.yaml index 7b674b53..6476e58b 100644 --- a/charts/matrix-stack/templates/well-known/configmap.yaml +++ b/charts/matrix-stack/templates/well-known/configmap.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2023-2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.wellKnownDelegation -}} diff --git a/charts/matrix-stack/templates/well-known/ingress.yaml b/charts/matrix-stack/templates/well-known/ingress.yaml index b67cd66d..59a45b6a 100644 --- a/charts/matrix-stack/templates/well-known/ingress.yaml +++ b/charts/matrix-stack/templates/well-known/ingress.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.wellKnownDelegation -}} diff --git a/charts/matrix-stack/templates/well-known/service.yaml b/charts/matrix-stack/templates/well-known/service.yaml index 0185dd0a..52b4f0b3 100644 --- a/charts/matrix-stack/templates/well-known/service.yaml +++ b/charts/matrix-stack/templates/well-known/service.yaml @@ -1,7 +1,7 @@ {{- /* Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only */ -}} {{- with $.Values.wellKnownDelegation -}} diff --git a/charts/matrix-stack/values.yaml b/charts/matrix-stack/values.yaml index 337766e9..cedf1355 100644 --- a/charts/matrix-stack/values.yaml +++ b/charts/matrix-stack/values.yaml @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # This file is generated. Do not edit directly. Edit source/values.yaml.j2 instead to make changes diff --git a/ct.yaml b/ct.yaml index 07d625bf..40b82486 100644 --- a/ct.yaml +++ b/ct.yaml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only --- all: true diff --git a/docker-bake.hcl b/docker-bake.hcl index 90375a4b..0b945115 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only // Targets filled by GitHub Actions: one for the regular tag target "docker-metadata-action" {} diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 23e08b6d..ed30f1a3 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1,7 +1,7 @@ # Architecture diff --git a/matrix-tools/Dockerfile b/matrix-tools/Dockerfile index 4b762c2d..b815e7a8 100644 --- a/matrix-tools/Dockerfile +++ b/matrix-tools/Dockerfile @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only FROM --platform=${BUILDPLATFORM} golang:1.23 AS buildstage diff --git a/matrix-tools/README.md b/matrix-tools/README.md index 279877b3..d56fccae 100644 --- a/matrix-tools/README.md +++ b/matrix-tools/README.md @@ -1,7 +1,7 @@ # Developer Guide for matrix-tools Go Project diff --git a/matrix-tools/cmd/main.go b/matrix-tools/cmd/main.go index f35d5013..e6e47cc9 100644 --- a/matrix-tools/cmd/main.go +++ b/matrix-tools/cmd/main.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package main diff --git a/matrix-tools/go.mod b/matrix-tools/go.mod index f759436b..13de6d31 100644 --- a/matrix-tools/go.mod +++ b/matrix-tools/go.mod @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only module github.com/element-hq/ess-helm/matrix-tools diff --git a/matrix-tools/go.sum.license b/matrix-tools/go.sum.license index 930aa7cc..7acc861a 100644 --- a/matrix-tools/go.sum.license +++ b/matrix-tools/go.sum.license @@ -1,2 +1,2 @@ Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only diff --git a/matrix-tools/internal/pkg/args/args.go b/matrix-tools/internal/pkg/args/args.go index f28344b5..c7a7f3e0 100644 --- a/matrix-tools/internal/pkg/args/args.go +++ b/matrix-tools/internal/pkg/args/args.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package args diff --git a/matrix-tools/internal/pkg/args/args_test.go b/matrix-tools/internal/pkg/args/args_test.go index 91663cdc..646e792f 100644 --- a/matrix-tools/internal/pkg/args/args_test.go +++ b/matrix-tools/internal/pkg/args/args_test.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package args diff --git a/matrix-tools/internal/pkg/renderer/renderer.go b/matrix-tools/internal/pkg/renderer/renderer.go index b74af177..7453a796 100644 --- a/matrix-tools/internal/pkg/renderer/renderer.go +++ b/matrix-tools/internal/pkg/renderer/renderer.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package renderer diff --git a/matrix-tools/internal/pkg/renderer/renderer_test.go b/matrix-tools/internal/pkg/renderer/renderer_test.go index 6bdf58dc..efb0029a 100644 --- a/matrix-tools/internal/pkg/renderer/renderer_test.go +++ b/matrix-tools/internal/pkg/renderer/renderer_test.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package renderer diff --git a/matrix-tools/internal/pkg/renderer/testdata/multiline.license b/matrix-tools/internal/pkg/renderer/testdata/multiline.license index 930aa7cc..7acc861a 100644 --- a/matrix-tools/internal/pkg/renderer/testdata/multiline.license +++ b/matrix-tools/internal/pkg/renderer/testdata/multiline.license @@ -1,2 +1,2 @@ Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only diff --git a/matrix-tools/internal/pkg/renderer/testdata/secret_key.license b/matrix-tools/internal/pkg/renderer/testdata/secret_key.license index 930aa7cc..7acc861a 100644 --- a/matrix-tools/internal/pkg/renderer/testdata/secret_key.license +++ b/matrix-tools/internal/pkg/renderer/testdata/secret_key.license @@ -1,2 +1,2 @@ Copyright 2025 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only diff --git a/matrix-tools/internal/pkg/secret/private_keys.go b/matrix-tools/internal/pkg/secret/private_keys.go index 7605a628..e81bbdca 100644 --- a/matrix-tools/internal/pkg/secret/private_keys.go +++ b/matrix-tools/internal/pkg/secret/private_keys.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package secret diff --git a/matrix-tools/internal/pkg/secret/secret.go b/matrix-tools/internal/pkg/secret/secret.go index 80b8c11f..7e1a1a91 100644 --- a/matrix-tools/internal/pkg/secret/secret.go +++ b/matrix-tools/internal/pkg/secret/secret.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only // internal/pkg/secret/secret.go package secret diff --git a/matrix-tools/internal/pkg/secret/secret_test.go b/matrix-tools/internal/pkg/secret/secret_test.go index e1a031d2..f8b6bc8c 100644 --- a/matrix-tools/internal/pkg/secret/secret_test.go +++ b/matrix-tools/internal/pkg/secret/secret_test.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package secret diff --git a/matrix-tools/internal/pkg/secret/signing_key.go b/matrix-tools/internal/pkg/secret/signing_key.go index cd9467b2..6294edc6 100644 --- a/matrix-tools/internal/pkg/secret/signing_key.go +++ b/matrix-tools/internal/pkg/secret/signing_key.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package secret diff --git a/matrix-tools/internal/pkg/secret/signing_key_test.go b/matrix-tools/internal/pkg/secret/signing_key_test.go index baaf380b..ac56136c 100644 --- a/matrix-tools/internal/pkg/secret/signing_key_test.go +++ b/matrix-tools/internal/pkg/secret/signing_key_test.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package secret diff --git a/matrix-tools/internal/pkg/tcpwait/tcpwait.go b/matrix-tools/internal/pkg/tcpwait/tcpwait.go index 005c417a..8730c8d6 100644 --- a/matrix-tools/internal/pkg/tcpwait/tcpwait.go +++ b/matrix-tools/internal/pkg/tcpwait/tcpwait.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package tcpwait diff --git a/matrix-tools/internal/pkg/tcpwait/tcpwait_test.go b/matrix-tools/internal/pkg/tcpwait/tcpwait_test.go index 2311f2e4..bec2ea5e 100644 --- a/matrix-tools/internal/pkg/tcpwait/tcpwait_test.go +++ b/matrix-tools/internal/pkg/tcpwait/tcpwait_test.go @@ -1,6 +1,6 @@ // Copyright 2025 New Vector Ltd // -// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// SPDX-License-Identifier: AGPL-3.0-only package tcpwait diff --git a/poetry.toml b/poetry.toml index 88d0cc2b..264dea4e 100644 --- a/poetry.toml +++ b/poetry.toml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only [virtualenvs] create = true diff --git a/pyproject.toml b/pyproject.toml index fd27a935..ba8ff4a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only [tool.poetry] description = "" diff --git a/scripts/assemble_ci_values_files_from_fragments.sh b/scripts/assemble_ci_values_files_from_fragments.sh index 1423c587..74d8dbdb 100755 --- a/scripts/assemble_ci_values_files_from_fragments.sh +++ b/scripts/assemble_ci_values_files_from_fragments.sh @@ -2,7 +2,7 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only set -euo pipefail @@ -48,7 +48,7 @@ for values_file in "$values_file_root"/*-values.yaml; do echo "Generating $values_file from $source_fragments"; echo "" > "$values_file" # REUSE-IgnoreStart - reuse annotate --copyright="Copyright 2024-$(date +%Y) New Vector Ltd" --license "AGPL-3.0-only OR LicenseRef-Element-Commercial" "$values_file" + reuse annotate --copyright="Copyright 2024-$(date +%Y) New Vector Ltd" --license "AGPL-3.0-only" "$values_file" # REUSE-IgnoreEnd cat << EOF >> "$values_file" diff --git a/scripts/assemble_helm_charts_from_fragments.sh b/scripts/assemble_helm_charts_from_fragments.sh index e10fbdcf..787c9b71 100755 --- a/scripts/assemble_helm_charts_from_fragments.sh +++ b/scripts/assemble_helm_charts_from_fragments.sh @@ -2,7 +2,7 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only set -euo pipefail @@ -23,7 +23,7 @@ function assemble_helm_chart_from_fragments() { "$scripts_dir/construct_helm_schema.py" "$chart_dir/source/values.schema.json" "$chart_dir/values.schema.json" "$scripts_dir/construct_helm_values.py" "$chart_dir/source/values.yaml.j2" "$chart_dir/values.yaml" # REUSE-IgnoreStart - reuse annotate --copyright="Copyright 2024-$(date +%Y) New Vector Ltd" --license "AGPL-3.0-only OR LicenseRef-Element-Commercial" "$chart_dir/values.yaml" + reuse annotate --copyright="Copyright 2024-$(date +%Y) New Vector Ltd" --license "AGPL-3.0-only" "$chart_dir/values.yaml" # REUSE-IgnoreEnd } diff --git a/scripts/check_newsfragment.sh b/scripts/check_newsfragment.sh index e4baf3ff..c489d89b 100755 --- a/scripts/check_newsfragment.sh +++ b/scripts/check_newsfragment.sh @@ -2,7 +2,7 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only # # A script which checks that an appropriate news file has been added on this diff --git a/scripts/construct_helm_schema.py b/scripts/construct_helm_schema.py index 132b1e47..1974599a 100755 --- a/scripts/construct_helm_schema.py +++ b/scripts/construct_helm_schema.py @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import json from pathlib import Path diff --git a/scripts/construct_helm_values.py b/scripts/construct_helm_values.py index 42a5099a..88091314 100755 --- a/scripts/construct_helm_values.py +++ b/scripts/construct_helm_values.py @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from pathlib import Path diff --git a/scripts/ct-lint.sh b/scripts/ct-lint.sh index 0effc46e..6e5c0320 100644 --- a/scripts/ct-lint.sh +++ b/scripts/ct-lint.sh @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only set -euo pipefail diff --git a/scripts/destroy_test_cluster.sh b/scripts/destroy_test_cluster.sh index 7c96d403..5f13bc2e 100755 --- a/scripts/destroy_test_cluster.sh +++ b/scripts/destroy_test_cluster.sh @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only set -e diff --git a/scripts/generate-signing-key.py b/scripts/generate-signing-key.py index 2aad5039..f3975b88 100755 --- a/scripts/generate-signing-key.py +++ b/scripts/generate-signing-key.py @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import signedjson.key diff --git a/scripts/set_chart_version.sh b/scripts/set_chart_version.sh index 91e60399..b8b51887 100755 --- a/scripts/set_chart_version.sh +++ b/scripts/set_chart_version.sh @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only set -euo pipefail diff --git a/scripts/setup_test_cluster.sh b/scripts/setup_test_cluster.sh index 55f86869..51f40027 100755 --- a/scripts/setup_test_cluster.sh +++ b/scripts/setup_test_cluster.sh @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only set -e diff --git a/scripts/spdx_checks.py b/scripts/spdx_checks.py index 8499af24..0099e428 100755 --- a/scripts/spdx_checks.py +++ b/scripts/spdx_checks.py @@ -2,7 +2,7 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import re import sys diff --git a/scripts/test_construct_helm_schema.py b/scripts/test_construct_helm_schema.py index 8e9e0ec0..ee50962c 100644 --- a/scripts/test_construct_helm_schema.py +++ b/scripts/test_construct_helm_schema.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import json import tempfile diff --git a/scripts/towncrier_to_helm_annotation.py b/scripts/towncrier_to_helm_annotation.py index 2f8bc9ea..263ec65f 100644 --- a/scripts/towncrier_to_helm_annotation.py +++ b/scripts/towncrier_to_helm_annotation.py @@ -2,7 +2,7 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from pathlib import Path diff --git a/tests/integration/artifacts/__init__.py b/tests/integration/artifacts/__init__.py index f3edd69e..7befb5c3 100644 --- a/tests/integration/artifacts/__init__.py +++ b/tests/integration/artifacts/__init__.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from .certs import CertKey, generate_ca, generate_cert, get_ca diff --git a/tests/integration/artifacts/certs.py b/tests/integration/artifacts/certs.py index 9bacc352..8f8d0725 100644 --- a/tests/integration/artifacts/certs.py +++ b/tests/integration/artifacts/certs.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from __future__ import annotations diff --git a/tests/integration/artifacts/files/minimal.png.license b/tests/integration/artifacts/files/minimal.png.license index c907f5db..6c7b58bf 100644 --- a/tests/integration/artifacts/files/minimal.png.license +++ b/tests/integration/artifacts/files/minimal.png.license @@ -1,3 +1,3 @@ Copyright 2024 New Vector Ltd -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +SPDX-License-Identifier: AGPL-3.0-only diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index e0aeaf0a..4c2b73ca 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only pytest_plugins = [ "integration.fixtures", diff --git a/tests/integration/env/element-web.rc b/tests/integration/env/element-web.rc index cac11bad..dea2eb72 100644 --- a/tests/integration/env/element-web.rc +++ b/tests/integration/env/element-web.rc @@ -1,5 +1,5 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only export TEST_VALUES_FILE=charts/matrix-stack/ci/pytest-element-web-values.yaml diff --git a/tests/integration/env/matrix-authentication-service.rc b/tests/integration/env/matrix-authentication-service.rc index ac11725b..6ab971ae 100644 --- a/tests/integration/env/matrix-authentication-service.rc +++ b/tests/integration/env/matrix-authentication-service.rc @@ -1,5 +1,5 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only export TEST_VALUES_FILE=charts/matrix-stack/ci/pytest-matrix-authentication-service-values.yaml diff --git a/tests/integration/env/synapse.rc b/tests/integration/env/synapse.rc index 4aab3e1e..5240bb57 100644 --- a/tests/integration/env/synapse.rc +++ b/tests/integration/env/synapse.rc @@ -1,5 +1,5 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only export TEST_VALUES_FILE=charts/matrix-stack/ci/pytest-synapse-values.yaml diff --git a/tests/integration/env/well-known-delegation.rc b/tests/integration/env/well-known-delegation.rc index 1f10bd82..862e9a7b 100644 --- a/tests/integration/env/well-known-delegation.rc +++ b/tests/integration/env/well-known-delegation.rc @@ -1,5 +1,5 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only export TEST_VALUES_FILE=charts/matrix-stack/ci/pytest-well-known-values.yaml diff --git a/tests/integration/fixtures/__init__.py b/tests/integration/fixtures/__init__.py index 6ef347c7..58e454eb 100644 --- a/tests/integration/fixtures/__init__.py +++ b/tests/integration/fixtures/__init__.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from .ca import ca, ssl_context from .cluster import cluster, ess_namespace, helm_client, ingress, kube_client, prometheus_operator_crds, registry diff --git a/tests/integration/fixtures/ca.py b/tests/integration/fixtures/ca.py index 50a14f09..4f67220c 100644 --- a/tests/integration/fixtures/ca.py +++ b/tests/integration/fixtures/ca.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import ssl diff --git a/tests/integration/fixtures/cluster.py b/tests/integration/fixtures/cluster.py index 9bdf4df1..97d04e03 100644 --- a/tests/integration/fixtures/cluster.py +++ b/tests/integration/fixtures/cluster.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import asyncio import os diff --git a/tests/integration/fixtures/data.py b/tests/integration/fixtures/data.py index 8e82b0b9..5a4bd1b3 100644 --- a/tests/integration/fixtures/data.py +++ b/tests/integration/fixtures/data.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import random import secrets diff --git a/tests/integration/fixtures/files/charts/cert-manager.yml b/tests/integration/fixtures/files/charts/cert-manager.yml index 8ae582f0..048bc672 100644 --- a/tests/integration/fixtures/files/charts/cert-manager.yml +++ b/tests/integration/fixtures/files/charts/cert-manager.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only crds: enabled: true diff --git a/tests/integration/fixtures/files/charts/ingress-nginx.yml b/tests/integration/fixtures/files/charts/ingress-nginx.yml index ba945c36..05e1ba8f 100644 --- a/tests/integration/fixtures/files/charts/ingress-nginx.yml +++ b/tests/integration/fixtures/files/charts/ingress-nginx.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only controller: ingressClassResource: diff --git a/tests/integration/fixtures/files/charts/metrics-server.yml b/tests/integration/fixtures/files/charts/metrics-server.yml index c322968d..6e456ae2 100644 --- a/tests/integration/fixtures/files/charts/metrics-server.yml +++ b/tests/integration/fixtures/files/charts/metrics-server.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only args: - --kubelet-insecure-tls diff --git a/tests/integration/fixtures/files/clusters/audit-policy.yml b/tests/integration/fixtures/files/clusters/audit-policy.yml index 8af775c6..16c51b35 100644 --- a/tests/integration/fixtures/files/clusters/audit-policy.yml +++ b/tests/integration/fixtures/files/clusters/audit-policy.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only apiVersion: audit.k8s.io/v1 kind: Policy diff --git a/tests/integration/fixtures/files/clusters/kind.yml b/tests/integration/fixtures/files/clusters/kind.yml index 08090d9f..17a8aacc 100644 --- a/tests/integration/fixtures/files/clusters/kind.yml +++ b/tests/integration/fixtures/files/clusters/kind.yml @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only apiVersion: kind.x-k8s.io/v1alpha4 kind: Cluster diff --git a/tests/integration/fixtures/helm.py b/tests/integration/fixtures/helm.py index 10ea4e25..f0c8d1af 100644 --- a/tests/integration/fixtures/helm.py +++ b/tests/integration/fixtures/helm.py @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import asyncio import base64 diff --git a/tests/integration/fixtures/matrix_tools.py b/tests/integration/fixtures/matrix_tools.py index a9968f6a..33a3a12a 100644 --- a/tests/integration/fixtures/matrix_tools.py +++ b/tests/integration/fixtures/matrix_tools.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import os from pathlib import Path diff --git a/tests/integration/fixtures/users.py b/tests/integration/fixtures/users.py index 56cac708..929befae 100644 --- a/tests/integration/fixtures/users.py +++ b/tests/integration/fixtures/users.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import asyncio diff --git a/tests/integration/lib/helpers.py b/tests/integration/lib/helpers.py index 0c6092b6..b9170e27 100644 --- a/tests/integration/lib/helpers.py +++ b/tests/integration/lib/helpers.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from collections.abc import Awaitable diff --git a/tests/integration/lib/matrix_authentication_service.py b/tests/integration/lib/matrix_authentication_service.py index d34b0d2d..e53e6f6b 100644 --- a/tests/integration/lib/matrix_authentication_service.py +++ b/tests/integration/lib/matrix_authentication_service.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from ssl import SSLContext from urllib.parse import urlparse diff --git a/tests/integration/lib/synapse.py b/tests/integration/lib/synapse.py index 0136a083..9c66197e 100644 --- a/tests/integration/lib/synapse.py +++ b/tests/integration/lib/synapse.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import hashlib import hmac diff --git a/tests/integration/lib/utils.py b/tests/integration/lib/utils.py index aa137cb2..96472ed5 100644 --- a/tests/integration/lib/utils.py +++ b/tests/integration/lib/utils.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import asyncio import base64 diff --git a/tests/integration/services/__init__.py b/tests/integration/services/__init__.py index 71645410..12468d9e 100644 --- a/tests/integration/services/__init__.py +++ b/tests/integration/services/__init__.py @@ -1,3 +1,3 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only diff --git a/tests/integration/test_element_web.py b/tests/integration/test_element_web.py index d0589317..3ed8de87 100644 --- a/tests/integration/test_element_web.py +++ b/tests/integration/test_element_web.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/integration/test_matrix_authentication_service.py b/tests/integration/test_matrix_authentication_service.py index 56cf4243..5b90b80c 100644 --- a/tests/integration/test_matrix_authentication_service.py +++ b/tests/integration/test_matrix_authentication_service.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/integration/test_networking.py b/tests/integration/test_networking.py index a62d5098..97ecd9f7 100644 --- a/tests/integration/test_networking.py +++ b/tests/integration/test_networking.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import asyncio import os diff --git a/tests/integration/test_pods.py b/tests/integration/test_pods.py index c1511e61..2ec3a195 100644 --- a/tests/integration/test_pods.py +++ b/tests/integration/test_pods.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/integration/test_synapse.py b/tests/integration/test_synapse.py index 26e4cb72..db27bfcd 100644 --- a/tests/integration/test_synapse.py +++ b/tests/integration/test_synapse.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import hashlib from pathlib import Path diff --git a/tests/integration/test_well_known_delegation.py b/tests/integration/test_well_known_delegation.py index a7cf26bc..65ec259a 100644 --- a/tests/integration/test_well_known_delegation.py +++ b/tests/integration/test_well_known_delegation.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import aiohttp import pytest diff --git a/tests/manifests/__init__.py b/tests/manifests/__init__.py index 5c6d1817..3350a52e 100644 --- a/tests/manifests/__init__.py +++ b/tests/manifests/__init__.py @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import abc from dataclasses import InitVar, dataclass, field diff --git a/tests/manifests/conftest.py b/tests/manifests/conftest.py index e76dec39..aa1c6ab4 100644 --- a/tests/manifests/conftest.py +++ b/tests/manifests/conftest.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only pytest_plugins = [ "manifests.utils", diff --git a/tests/manifests/test_basic.py b/tests/manifests/test_basic.py index 259b0215..aedea7c4 100644 --- a/tests/manifests/test_basic.py +++ b/tests/manifests/test_basic.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_configs_and_mounts_consistency.py b/tests/manifests/test_configs_and_mounts_consistency.py index bbea9561..8824c0d8 100644 --- a/tests/manifests/test_configs_and_mounts_consistency.py +++ b/tests/manifests/test_configs_and_mounts_consistency.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import re diff --git a/tests/manifests/test_ingresses.py b/tests/manifests/test_ingresses.py index 1367b976..ec6cf651 100644 --- a/tests/manifests/test_ingresses.py +++ b/tests/manifests/test_ingresses.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from typing import Any diff --git a/tests/manifests/test_labels.py b/tests/manifests/test_labels.py index 8cc7b91f..65076deb 100644 --- a/tests/manifests/test_labels.py +++ b/tests/manifests/test_labels.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from hashlib import sha1 diff --git a/tests/manifests/test_manifest_test_infrastructure.py b/tests/manifests/test_manifest_test_infrastructure.py index 46518d50..e6a05b97 100644 --- a/tests/manifests/test_manifest_test_infrastructure.py +++ b/tests/manifests/test_manifest_test_infrastructure.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from pathlib import Path diff --git a/tests/manifests/test_pod_containers_ports.py b/tests/manifests/test_pod_containers_ports.py index 9f0fb49d..652ce2cb 100644 --- a/tests/manifests/test_pod_containers_ports.py +++ b/tests/manifests/test_pod_containers_ports.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_pod_pull_secrets.py b/tests/manifests/test_pod_pull_secrets.py index 5c83a382..dfc49f9f 100644 --- a/tests/manifests/test_pod_pull_secrets.py +++ b/tests/manifests/test_pod_pull_secrets.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_pod_securityContext.py b/tests/manifests/test_pod_securityContext.py index 15ff67a5..9bcc344d 100644 --- a/tests/manifests/test_pod_securityContext.py +++ b/tests/manifests/test_pod_securityContext.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_secrets.py b/tests/manifests/test_secrets.py index 85b476af..b8e1d235 100644 --- a/tests/manifests/test_secrets.py +++ b/tests/manifests/test_secrets.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_service_monitors.py b/tests/manifests/test_service_monitors.py index 8649c057..a92e64fe 100644 --- a/tests/manifests/test_service_monitors.py +++ b/tests/manifests/test_service_monitors.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from collections.abc import Iterator from typing import Any diff --git a/tests/manifests/test_serviceaccounts.py b/tests/manifests/test_serviceaccounts.py index 1db86456..6797d919 100644 --- a/tests/manifests/test_serviceaccounts.py +++ b/tests/manifests/test_serviceaccounts.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import copy diff --git a/tests/manifests/test_services.py b/tests/manifests/test_services.py index 3b883757..c37e2a74 100644 --- a/tests/manifests/test_services.py +++ b/tests/manifests/test_services.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_statefulset.py b/tests/manifests/test_statefulset.py index 538ff2ef..ddc4fd06 100644 --- a/tests/manifests/test_statefulset.py +++ b/tests/manifests/test_statefulset.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_synapse.py b/tests/manifests/test_synapse.py index c14a4802..017926d7 100644 --- a/tests/manifests/test_synapse.py +++ b/tests/manifests/test_synapse.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only from typing import Any diff --git a/tests/manifests/test_tolerations.py b/tests/manifests/test_tolerations.py index 0afec666..0ff12420 100644 --- a/tests/manifests/test_tolerations.py +++ b/tests/manifests/test_tolerations.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_volumes_mounts.py b/tests/manifests/test_volumes_mounts.py index b2a5119b..aa40c76c 100644 --- a/tests/manifests/test_volumes_mounts.py +++ b/tests/manifests/test_volumes_mounts.py @@ -1,6 +1,6 @@ # Copyright 2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import pytest diff --git a/tests/manifests/test_well_known_delegation.py b/tests/manifests/test_well_known_delegation.py index c2f9d913..74d47b1b 100644 --- a/tests/manifests/test_well_known_delegation.py +++ b/tests/manifests/test_well_known_delegation.py @@ -1,6 +1,6 @@ # Copyright 2024 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import json import re diff --git a/tests/manifests/utils.py b/tests/manifests/utils.py index 9e8d9130..d66179b2 100644 --- a/tests/manifests/utils.py +++ b/tests/manifests/utils.py @@ -1,6 +1,6 @@ # Copyright 2024-2025 New Vector Ltd # -# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +# SPDX-License-Identifier: AGPL-3.0-only import copy import json