diff options
| author | Luke Hoersten <[email protected]> | 2024-10-07 15:25:37 -0500 |
|---|---|---|
| committer | Luke Hoersten <[email protected]> | 2024-10-07 15:25:37 -0500 |
| commit | 27739609362360b2bf533f5a59106ce52c8d4b9f (patch) | |
| tree | f42d1f682ae64078204066235abbd129ec950441 /dendrite | |
| parent | 874be10f6646a66cd0e994963b2746ad48f5b73e (diff) | |
Lots of updates and fixes for Ubuntu 24.04 Noble.
Diffstat (limited to 'dendrite')
| -rw-r--r-- | dendrite/build/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | dendrite/server/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | dendrite/server/templates/dendrite.yaml.j2 | 8 | ||||
| -rw-r--r-- | dendrite/server/templates/setup_db.psql.j2 | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/dendrite/build/defaults/main.yaml b/dendrite/build/defaults/main.yaml index 98d9426..1177a2e 100644 --- a/dendrite/build/defaults/main.yaml +++ b/dendrite/build/defaults/main.yaml @@ -1,6 +1,6 @@ --- -dendrite_version: "0.13.7" +dendrite_version: "0.13.8" # https://github.com/matrix-org/dendrite/releases dendrite_tar: "https://github.com/matrix-org/dendrite/archive/refs/tags/v{{dendrite_version}}.tar.gz" dendrite_build_dir: "/tmp/dendrite-{{dendrite_version}}" diff --git a/dendrite/server/defaults/main.yaml b/dendrite/server/defaults/main.yaml index c130eb8..bf7e7a0 100644 --- a/dendrite/server/defaults/main.yaml +++ b/dendrite/server/defaults/main.yaml @@ -2,7 +2,7 @@ dendrite_user: "dendrite" dendrite_old_key: false -dendrite_registration_disabled: true +dendrite_registration_disabled: "true" dendrite_registration_secret: "" dendrite_db_user: "dendrite_{{dendrite_instance}}" @@ -11,7 +11,7 @@ dendrite_db: "{{dendrite_db_user}}" dendrite_dir: "/var/dendrite" dendrite_port: 8008 -dendrite_recaptcha_enable: false +dendrite_recaptcha_enable: "false" dendrite_recaptcha_public_key: "" dendrite_recaptcha_private_key: "" dendrite_recaptcha_bypass_secret: "" diff --git a/dendrite/server/templates/dendrite.yaml.j2 b/dendrite/server/templates/dendrite.yaml.j2 index 350b96d..0fe6aa2 100644 --- a/dendrite/server/templates/dendrite.yaml.j2 +++ b/dendrite/server/templates/dendrite.yaml.j2 @@ -38,7 +38,7 @@ global: # you must configure the "database" block for each component instead. database: connection_string: postgresql://{{dendrite_db_user}}:{{dendrite_db_pass}}@localhost/{{dendrite_db}}?sslmode=disable - max_open_conns: 90 + max_open_conns: 25 max_idle_conns: 5 conn_max_lifetime: -1 @@ -139,9 +139,9 @@ global: # Optional DNS cache. The DNS cache may reduce the load on DNS servers if there # is no local caching resolver available for use. dns_cache: - enabled: false - cache_size: 256 - cache_lifetime: "5m" # 5 minutes; https://pkg.go.dev/time@master#ParseDuration + enabled: true + cache_size: 4096 + cache_lifetime: "10m" # 10 minutes; https://pkg.go.dev/time@master#ParseDuration # Configuration for the Appservice API. app_service_api: diff --git a/dendrite/server/templates/setup_db.psql.j2 b/dendrite/server/templates/setup_db.psql.j2 index 29c6974..27667cc 100644 --- a/dendrite/server/templates/setup_db.psql.j2 +++ b/dendrite/server/templates/setup_db.psql.j2 @@ -1,3 +1,3 @@ CREATE USER {{dendrite_db_user}}; -ALTER USER {{dendrite_db_user}} WITH PASSWORD '{{dendrite_db_pass}}' +ALTER USER {{dendrite_db_user}} WITH PASSWORD '{{dendrite_db_pass}}'; CREATE DATABASE {{dendrite_db}} WITH OWNER {{dendrite_db_user}}; |
