Procházet zdrojové kódy

Merge pull request #614 from vractal/enable-ma1sd-hashing

Enable ma1sd hashing by default
pull/616/head
Slavi Pantaleev před 5 roky
committed by GitHub
rodič
revize
a7382924fc
V databázi nebyl nalezen žádný známý klíč pro tento podpis ID GPG klíče: 4AEE18F83AFDEB23
2 změnil soubory, kde provedl 16 přidání a 0 odebrání
  1. +3
    -0
      roles/matrix-ma1sd/defaults/main.yml
  2. +13
    -0
      roles/matrix-ma1sd/templates/ma1sd.yaml.j2

+ 3
- 0
roles/matrix-ma1sd/defaults/main.yml Zobrazit soubor

@@ -83,6 +83,9 @@ matrix_ma1sd_verbose_logging: false
matrix_ma1sd_v1_enabled: true matrix_ma1sd_v1_enabled: true
matrix_ma1sd_v2_enabled: true matrix_ma1sd_v2_enabled: true


# Fix for missing 3PIDS bug
matrix_ma1sd_hashing_enabled: true

# Default ma1sd configuration template which covers the generic use case. # Default ma1sd configuration template which covers the generic use case.
# You can customize it by controlling the various variables inside it. # You can customize it by controlling the various variables inside it.
# #


+ 13
- 0
roles/matrix-ma1sd/templates/ma1sd.yaml.j2 Zobrazit soubor

@@ -63,6 +63,19 @@ threepid:
{% endif %} {% endif %}
{% endif %} {% endif %}


{% if matrix_ma1sd_hashing_enabled %}
hashing:
enabled: true # enable or disable the hash lookup MSC2140 (default is false)
pepperLength: 20 # length of the pepper value (default is 20)
rotationPolicy: per_requests # or `per_seconds` how often the hashes will be updating
hashStorageType: sql # or `in_memory` where the hashes will be stored
algorithms:
- none # the same as v1 bulk lookup
- sha256 # hash the 3PID and pepper.
delay: 2m # how often hashes will be updated if rotation policy = per_seconds (default is 10s)
requests: 10
{% endif %}

synapseSql: synapseSql:
enabled: {{ matrix_ma1sd_synapsesql_enabled }} enabled: {{ matrix_ma1sd_synapsesql_enabled }}
type: {{ matrix_ma1sd_synapsesql_type }} type: {{ matrix_ma1sd_synapsesql_type }}


Načítá se…
Zrušit
Uložit