Agosto 2025 - Git do Root C3SL

[Git][root/k8s/fluxcd][main] fix(matrix); targetPath instead of valuesKey
by Fernando K (＠fmkiotheka) 01 Ago '25

01 Ago '25

Fernando K pushed to branch main at Root / Kubernetes / FluxCD Commits: 65bd5f33 by Fernando Monteiro Kiotheka at 2025-08-01T12:45:14-03:00 fix(matrix); targetPath instead of valuesKey - - - - - 1 changed file: - apps/base/matrix/helmrelease.yaml Changes: ===================================== apps/base/matrix/helmrelease.yaml ===================================== @@ -104,4 +104,4 @@ spec: valuesFrom: - kind: ConfigMap name: element-web-configuration - valuesKey: elementWeb.additional + targetPath: elementWeb.additional View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/65bd5f33223f0033ccd681… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/65bd5f33223f0033ccd681… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] fix(matrix); add missing namespace to configMapGenerator
by Fernando K (＠fmkiotheka) 01 Ago '25

01 Ago '25

Fernando K pushed to branch main at Root / Kubernetes / FluxCD Commits: 579a95c4 by Fernando Monteiro Kiotheka at 2025-08-01T12:43:32-03:00 fix(matrix); add missing namespace to configMapGenerator - - - - - 1 changed file: - apps/base/matrix/kustomization.yaml Changes: ===================================== apps/base/matrix/kustomization.yaml ===================================== @@ -7,6 +7,7 @@ resources: - helmrelease.yaml configMapGenerator: - name: element-web-configuration + namespace: matrix files: - config.json - themes-config.json View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/579a95c4ecc361d1e53f63… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/579a95c4ecc361d1e53f63… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] fix(matrix): db locale
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD Commits: 3ff358bc by marcusvrp at 2025-08-01T06:01:11-03:00 fix(matrix): db locale - - - - - 1 changed file: - apps/base/matrix/helmrelease.yaml Changes: ===================================== apps/base/matrix/helmrelease.yaml ===================================== @@ -67,6 +67,10 @@ spec: s3-config: configSecret: matrix configSecretKey: synapseS3Config + fix-db-locale: + config: | + database: + allow_unsafe_locale: true matrixAuthenticationService: ingress: host: auth.matrix.c3sl.ufpr.br View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/3ff358bcb9cb740b3cb88b… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/3ff358bcb9cb740b3cb88b… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] fix(matrixtest): wrong user and db names
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD Commits: b21043b5 by marcusvrp at 2025-08-01T05:51:06-03:00 fix(matrixtest): wrong user and db names - - - - - 1 changed file: - apps/base/matrix/helmrelease.yaml Changes: ===================================== apps/base/matrix/helmrelease.yaml ===================================== @@ -32,8 +32,8 @@ spec: tlsSecret: synapse-tls postgres: host: postgres.c3sl.ufpr.br - user: matrix-synapse - database: matrix-synapse + user: matrix_synapse + database: matrix_synapse password: secret: matrix secretKey: synapsePostgresPassword @@ -73,8 +73,8 @@ spec: tlsSecret: mas-tls postgres: host: postgres.c3sl.ufpr.br - user: matrix-auth - database: matrix-auth + user: matrix_auth + database: matrix_auth password: secret: matrix secretKey: masPostgresPassword View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/b21043b509e3dfb11984a7… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/b21043b509e3dfb11984a7… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/services/matrixsynapse][main] fix: use correct registry
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Serviços / Matrix Synapse Commits: e678c654 by marcusvrp at 2025-08-01T05:50:14-03:00 fix: use correct registry - - - - - 1 changed file: - Dockerfile Changes: ===================================== Dockerfile ===================================== @@ -1,4 +1,4 @@ -FROM element-hq/synapse:v1.134.0 +FROM ghcr.io/element-hq/synapse:v1.134.0 # Enable S3 Storage Provider Module RUN apt-get update && apt-get install -y git python3-pip View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/matrixsynapse/-/commit/e678c65477… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/matrixsynapse/-/commit/e678c65477… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/services/matrixsynapse][main] fix: define source tag
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Serviços / Matrix Synapse Commits: bbd282a7 by marcusvrp at 2025-08-01T05:43:24-03:00 fix: define source tag - - - - - 1 changed file: - Dockerfile Changes: ===================================== Dockerfile ===================================== @@ -1,4 +1,4 @@ -FROM matrixdotorg/synapse +FROM element-hq/synapse:v1.134.0 # Enable S3 Storage Provider Module RUN apt-get update && apt-get install -y git python3-pip View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/matrixsynapse/-/commit/bbd282a781… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/matrixsynapse/-/commit/bbd282a781… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] fix(matrix): repo and registry
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD Commits: 99f44ee3 by marcusvrp at 2025-08-01T05:42:24-03:00 fix(matrix): repo and registry - - - - - 1 changed file: - apps/base/matrix/helmrelease.yaml Changes: ===================================== apps/base/matrix/helmrelease.yaml ===================================== @@ -23,7 +23,8 @@ spec: enabled: false synapse: image: - repository: harbor.c3sl.ufpr.br/root/synapse + registry: harbor.c3sl.ufpr.br + repository: root/synapse tag: latest pullPolicy: Always ingress: View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/99f44ee385c52aa08671dd… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/99f44ee385c52aa08671dd… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] feat(matrix): use external postgres database
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Kubernetes / FluxCD Commits: 6dedc9ec by marcusvrp at 2025-08-01T05:31:13-03:00 feat(matrix): use external postgres database - - - - - 2 changed files: - apps/base/matrix/es.yaml - apps/base/matrix/helmrelease.yaml Changes: ===================================== apps/base/matrix/es.yaml ===================================== @@ -11,47 +11,19 @@ spec: target: name: matrix data: - # - secretKey: oidcClientId - # remoteRef: - # key: matrix - # property: oidcClientId - # - secretKey: oidcClientSecret - # remoteRef: - # key: matrix - # property: oidcClientSecret - # - secretKey: postgresHost - # remoteRef: - # key: matrix - # property: postgresHost - # - secretKey: postgresPassword - # remoteRef: - # key: matrix - # property: postgresPassword - # - secretKey: postgresUser - # remoteRef: - # key: matrix - # property: postgresUser - # - secretKey: s3AccessKey - # remoteRef: - # key: matrix - # property: s3AccessKey - # - secretKey: s3Bucket - # remoteRef: - # key: matrix - # property: s3Bucket - # - secretKey: s3Endpoint - # remoteRef: - # key: matrix - # property: s3Endpoint - # - secretKey: s3SecretAccessKey - # remoteRef: - # key: matrix - # property: s3SecretAccessKey - secretKey: masOidcConfig remoteRef: key: matrix property: masOidcConfig - - secretKey: synapseOidcConfig + - secretKey: synapseS3Config remoteRef: key: matrix - property: synapseOidcConfig + property: synapseS3Config + - secretKey: synapsePostgresPassword + remoteRef: + key: matrix + property: synapsePostgresPassword + - secretKey: masPostgresPassword + remoteRef: + key: matrix + property: masPostgresPassword ===================================== apps/base/matrix/helmrelease.yaml ===================================== @@ -19,12 +19,28 @@ spec: cert-manager.io/cluster-issuer: letsencrypt-wildcard tlsSecret: matrix-tls postgres: - enabled: true + # do not use **internal** postgres db + enabled: false synapse: + image: harbor.c3sl.ufpr.br/root/synapse ingress: host: synapse.matrix.c3sl.ufpr.br tlsSecret: synapse-tls + postgres: + host: postgres.c3sl.ufpr.br + user: matrix-synapse + database: matrix-synapse + password: + secret: matrix + secretKey: synapsePostgresPassword additional: + allow-search-users: + config: | + user_directory: + enabled: true + search_all_users: true + prefer_local_users: true + show_locked_users: false custom-config: config: | report_stats: false @@ -44,10 +60,20 @@ spec: enable_notifs: true notif_for_new_users: true validation_token_lifetime: 15m + s3-config: + configSecret: matrix + configSecretKey: synapseS3Config matrixAuthenticationService: ingress: host: auth.matrix.c3sl.ufpr.br tlsSecret: mas-tls + postgres: + host: postgres.c3sl.ufpr.br + user: matrix-auth + database: matrix-auth + password: + secret: matrix + secretKey: masPostgresPassword additional: button-text: config: | View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/6dedc9ec82affe8483b5a8… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/6dedc9ec82affe8483b5a8… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/dbroot/postgresql-sync-config][main] split matrix db concerns
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / DBRoot / PostgreSQL Commits: 8c03b2a4 by marcusvrp at 2025-08-01T05:30:24-03:00 split matrix db concerns - - - - - 1 changed file: - pg_hba.conf Changes: ===================================== pg_hba.conf ===================================== @@ -125,11 +125,17 @@ hostssl nextcloud nextcloud wrk4-k8sstage.c3sl.ufpr.br s hostssl nextcloud nextcloud wrk5-k8sstage.c3sl.ufpr.br scram-sha-256 # Matrix -hostssl matrix matrix wrk1-k8sstage.c3sl.ufpr.br scram-sha-256 -hostssl matrix matrix wrk2-k8sstage.c3sl.ufpr.br scram-sha-256 -hostssl matrix matrix wrk3-k8sstage.c3sl.ufpr.br scram-sha-256 -hostssl matrix matrix wrk4-k8sstage.c3sl.ufpr.br scram-sha-256 -hostssl matrix matrix wrk5-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_synapse matrix_synapse wrk1-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_synapse matrix_synapse wrk2-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_synapse matrix_synapse wrk3-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_synapse matrix_synapse wrk4-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_synapse matrix_synapse wrk5-k8sstage.c3sl.ufpr.br scram-sha-256 + +hostssl matrix_auth matrix_auth wrk1-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_auth matrix_auth wrk2-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_auth matrix_auth wrk3-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_auth matrix_auth wrk4-k8sstage.c3sl.ufpr.br scram-sha-256 +hostssl matrix_auth matrix_auth wrk5-k8sstage.c3sl.ufpr.br scram-sha-256 # rallly hostssl rallly rallly wrk1-k8sstage.c3sl.ufpr.br scram-sha-256 View it on GitLab: https://gitlab.c3sl.ufpr.br/root/dbroot/postgresql-sync-config/-/commit/8c0… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/dbroot/postgresql-sync-config/-/commit/8c0… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/services/matrixsynapse][main] feat: new image for helmrelease
by MarcusVRP (＠mvreisdoefer) 01 Ago '25

01 Ago '25

MarcusVRP pushed to branch main at Root / Serviços / Matrix Synapse Commits: 7fe4ac5f by marcusvrp at 2025-08-01T05:05:19-03:00 feat: new image for helmrelease - - - - - 5 changed files: - Dockerfile - README.md - − configure.sh - − homeserver.yaml.template - − merge.py Changes: ===================================== Dockerfile ===================================== @@ -1,17 +1,7 @@ FROM matrixdotorg/synapse # Enable S3 Storage Provider Module -RUN apt-get update && apt-get install -y git python3-pip gettext-base +RUN apt-get update && apt-get install -y git python3-pip RUN git clone https://github.com/matrix-org/synapse-s3-storage-provider.git -RUN pip install --break-system-packages boto3 pyyaml +RUN pip install --break-system-packages boto3 ENV PYTHONPATH /synapse-s3-storage-provider - -# Copy files to render the synapse config later -COPY ./ /root/ - -# Then you just gotta use an initContainer that runs: -# /root/configure.sh - -# Note that for this to work you have to set the proper ENV variables expected in the template file (check it) - -ENTRYPOINT /root/configure.sh ===================================== README.md ===================================== @@ -1,7 +1,25 @@ -# C3SL Synapse Image +# Synapse Docker C3SL -Imagem customizada do C3SL para o synapse, facilitando o uso de segredos no Kubernetes e possibilitando o uso do S3. +## Problema -Mais detalhes: perguntar pro Marcus. +No [Helm ESS](https://github.com/element-hq/ess-helm), a versão community [não inclui suporte nativo para armazenamento via S3](https://github.com/element-hq/ess-helm/issues/558). Para resolver essa limitação, criamos uma imagem personalizada do Synapse que inclui o módulo de S3 Storage Provider. -TODO: element-web image will need something similar +Para atualizar a imagem basta clonar o repositório e editar a tag da imagem do synapse no Dockerfile, então buildar e dar push no harbor: + +``` +git clone git@gitlab.c3sl.ufpr.br:root/services/matrixsynapse.git + +# faz novo build da imagem +vim Dockerfile +docker build . -t harbor.c3sl.ufpr.br/root/synapse + +# login no registry +pass -c harbor.c3sl.ufpr.br/admin +docker login harbor.c3sl.ufpr.br +# user admin, senha vc sabe + +# finalmente... atualiza a imagem +docker push harbor.c3sl.ufpr.br/root/synapse +``` + +**TODO**: fazer build e push direto com commits no repositório. ===================================== configure.sh deleted ===================================== @@ -1,5 +0,0 @@ -#!/bin/bash -envsubst < /root/homeserver.yaml.template > /root/homeserver.yaml && \ -/start.py generate && \ -python3 /root/merge.py /data/homeserver.yaml /root/homeserver.yaml -o /data/homeserver.yaml && \ -/start.py ===================================== homeserver.yaml.template deleted ===================================== @@ -1,71 +0,0 @@ -server_name: "${SYNAPSE_SERVER_NAME}" - -database: - allow_unsafe_locale: true - name: "psycopg2" - args: - user: "${POSTGRES_USER}" - password: "${POSTGRES_PASSWORD}" - database: "${POSTGRES_DB}" - host: "${POSTGRES_HOST}" - cp_min: 5 - cp_max: 10 - -report_stats: false - -trusted_key_servers: - - server_name: "${SYNAPSE_SERVER_NAME}" - - server_name: "matrix.org" -public_baseurl: "https://${SYNAPSE_SERVER_NAME}" -serve_server_wellknown: true - - -oidc_providers: -- idp_id: "keycloak" - enable_registration: true - idp_name: "${OIDC_IDP_NAME}" - discover: true - issuer: "${OIDC_ISSUER}" - client_id: "${OIDC_CLIENT_ID}" - client_secret: "${OIDC_CLIENT_SECRET}" - scopes: ["openid", "profile"] - user_mapping_provider: - config: - localpart_template: "{{ user.preferred_username }}" - display_name_template: "{{ user.name }}" - -enable_registration: false - -default_identity_server: "https://${SYNAPSE_SERVER_NAME}" - -trusted_third_party_id_servers: - - "${SYNAPSE_SERVER_NAME}" - -email: - smtp_host: smtp.c3sl.ufpr.br - smtp_port: 25 - notif_from: "${SYNAPSE_SERVER_NAME}" - enable_notifs: true - notif_for_new_users: true - validation_token_lifetime: 15m - -media_storage_providers: -- module: s3_storage_provider.S3StorageProviderBackend - store_local: False - store_remote: True - store_synchronous: True - config: - bucket: "${S3_BUCKET_NAME}" - region_name: "${S3_REGION_NAME}" - endpoint_url: "${S3_ENDPOINT_URL}" - access_key_id: "${S3_ACCESS_KEY_ID}" - secret_access_key: "${S3_SECRET_ACCESS_KEY}" - -user_directory: - enabled: true - search_all_users: true - prefer_local_users: true - show_locked_users: false - -# vim:ft=yaml -# ===================================== merge.py deleted ===================================== @@ -1,45 +0,0 @@ -import yaml -import argparse -import sys - -def load_yaml_file(path): - try: - with open(path, 'r') as file: - return yaml.safe_load(file) or {} - except FileNotFoundError: - print(f"File not found: {path}") - sys.exit(1) - except yaml.YAMLError as e: - print(f"Error parsing YAML file {path}: {e}") - sys.exit(1) - -def merge_dicts(dict1, dict2): - """Recursively merge dict2 into dict1 (dict2 wins conflicts).""" - for key, value in dict2.items(): - if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict): - merge_dicts(dict1[key], value) - else: - dict1[key] = value - return dict1 - -def write_yaml_file(data, path): - with open(path, 'w') as file: - yaml.safe_dump(data, file, default_flow_style=False) - -def main(): - parser = argparse.ArgumentParser(description="Merge two YAML files.") - parser.add_argument("file1", help="First input YAML file") - parser.add_argument("file2", help="Second input YAML file (overrides file1's values on conflict)") - parser.add_argument("-o", "--output", default="merged.yaml", help="Output YAML file (default: merged.yaml)") - - args = parser.parse_args() - - yaml1 = load_yaml_file(args.file1) - yaml2 = load_yaml_file(args.file2) - merged = merge_dicts(yaml1, yaml2) - write_yaml_file(merged, args.output) - - print(f"Merged YAML written to {args.output}") - -if __name__ == "__main__": - main() View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/matrixsynapse/-/commit/7fe4ac5fef… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/matrixsynapse/-/commit/7fe4ac5fef… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0