mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-10 12:47:39 +01:00
Remove Dendrite file logging
We refrain from logging to files for all components, because we rely on systemd-journald anyway.
This commit is contained in:
parent
953a9ac718
commit
ccd3dc7a57
@ -53,10 +53,6 @@ matrix_dendrite_max_file_size_bytes: 10485760
|
|||||||
# The tmpfs at /tmp needs to be large enough to handle multiple concurrent file uploads.
|
# The tmpfs at /tmp needs to be large enough to handle multiple concurrent file uploads.
|
||||||
matrix_dendrite_tmp_directory_size_mb: 500
|
matrix_dendrite_tmp_directory_size_mb: 500
|
||||||
|
|
||||||
# Log levels
|
|
||||||
matrix_dendrite_log_level: "warning"
|
|
||||||
matrix_dendrite_log_path: "/var/log/dendrite"
|
|
||||||
|
|
||||||
# Rate limits
|
# Rate limits
|
||||||
matrix_dendrite_rate_limiting_enabled: true
|
matrix_dendrite_rate_limiting_enabled: true
|
||||||
matrix_dendrite_rate_limiting_threshold: 5
|
matrix_dendrite_rate_limiting_threshold: 5
|
||||||
|
@ -17,14 +17,6 @@
|
|||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists"
|
when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists"
|
||||||
|
|
||||||
- name: Ensure Dendrite log path exists
|
|
||||||
file:
|
|
||||||
path: "{{ matrix_dendrite_log_path }}"
|
|
||||||
state: directory
|
|
||||||
mode: 0644
|
|
||||||
owner: "{{ matrix_user_username }}"
|
|
||||||
group: "{{ matrix_user_groupname }}"
|
|
||||||
|
|
||||||
- name: Ensure Dendrite Docker image is pulled
|
- name: Ensure Dendrite Docker image is pulled
|
||||||
docker_image:
|
docker_image:
|
||||||
name: "{{ matrix_dendrite_docker_image }}"
|
name: "{{ matrix_dendrite_docker_image }}"
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#
|
#
|
||||||
# At a minimum, to get started, you will need to update the settings in the
|
# At a minimum, to get started, you will need to update the settings in the
|
||||||
# "global" section for your deployment, and you will need to check that the
|
# "global" section for your deployment, and you will need to check that the
|
||||||
# database "connection_string" line in each component section is correct.
|
# database "connection_string" line in each component section is correct.
|
||||||
#
|
#
|
||||||
# Each component with a "database" section can accept the following formats
|
# Each component with a "database" section can accept the following formats
|
||||||
# for "connection_string":
|
# for "connection_string":
|
||||||
@ -21,13 +21,13 @@
|
|||||||
# small number of users and likely will perform worse still with a higher volume
|
# small number of users and likely will perform worse still with a higher volume
|
||||||
# of users.
|
# of users.
|
||||||
#
|
#
|
||||||
# The "max_open_conns" and "max_idle_conns" settings configure the maximum
|
# The "max_open_conns" and "max_idle_conns" settings configure the maximum
|
||||||
# number of open/idle database connections. The value 0 will use the database
|
# number of open/idle database connections. The value 0 will use the database
|
||||||
# engine default, and a negative value will use unlimited connections. The
|
# engine default, and a negative value will use unlimited connections. The
|
||||||
# "conn_max_lifetime" option controls the maximum length of time a database
|
# "conn_max_lifetime" option controls the maximum length of time a database
|
||||||
# connection can be idle in seconds - a negative value is unlimited.
|
# connection can be idle in seconds - a negative value is unlimited.
|
||||||
|
|
||||||
# The version of the configuration file.
|
# The version of the configuration file.
|
||||||
version: 1
|
version: 1
|
||||||
|
|
||||||
# Global Matrix configuration. This configuration applies to all components.
|
# Global Matrix configuration. This configuration applies to all components.
|
||||||
@ -133,13 +133,13 @@ client_api:
|
|||||||
# Whether to require reCAPTCHA for registration.
|
# Whether to require reCAPTCHA for registration.
|
||||||
enable_registration_captcha: {{ matrix_dendrite_enable_registration_captcha|to_json }}
|
enable_registration_captcha: {{ matrix_dendrite_enable_registration_captcha|to_json }}
|
||||||
|
|
||||||
# Settings for ReCAPTCHA.
|
# Settings for ReCAPTCHA.
|
||||||
recaptcha_public_key: {{ matrix_dendrite_recaptcha_public_key|to_json }}
|
recaptcha_public_key: {{ matrix_dendrite_recaptcha_public_key|to_json }}
|
||||||
recaptcha_private_key: {{ matrix_dendrite_recaptcha_private_key|to_json }}
|
recaptcha_private_key: {{ matrix_dendrite_recaptcha_private_key|to_json }}
|
||||||
recaptcha_bypass_secret: ""
|
recaptcha_bypass_secret: ""
|
||||||
recaptcha_siteverify_api: ""
|
recaptcha_siteverify_api: ""
|
||||||
|
|
||||||
# TURN server information that this homeserver should send to clients.
|
# TURN server information that this homeserver should send to clients.
|
||||||
turn:
|
turn:
|
||||||
turn_user_lifetime: ""
|
turn_user_lifetime: ""
|
||||||
turn_uris: {{ matrix_dendrite_turn_uris|to_json }}
|
turn_uris: {{ matrix_dendrite_turn_uris|to_json }}
|
||||||
@ -148,7 +148,7 @@ client_api:
|
|||||||
turn_password: ""
|
turn_password: ""
|
||||||
|
|
||||||
# Settings for rate-limited endpoints. Rate limiting will kick in after the
|
# Settings for rate-limited endpoints. Rate limiting will kick in after the
|
||||||
# threshold number of "slots" have been taken by requests from a specific
|
# threshold number of "slots" have been taken by requests from a specific
|
||||||
# host. Each "slot" will be released after the cooloff time in milliseconds.
|
# host. Each "slot" will be released after the cooloff time in milliseconds.
|
||||||
rate_limiting:
|
rate_limiting:
|
||||||
enabled: {{ matrix_dendrite_rate_limiting_enabled|to_json }}
|
enabled: {{ matrix_dendrite_rate_limiting_enabled|to_json }}
|
||||||
@ -192,7 +192,7 @@ federation_sender:
|
|||||||
|
|
||||||
# Disable the validation of TLS certificates of remote federated homeservers. Do not
|
# Disable the validation of TLS certificates of remote federated homeservers. Do not
|
||||||
# enable this option in production as it presents a security risk!
|
# enable this option in production as it presents a security risk!
|
||||||
disable_tls_validation: {{ matrix_dendrite_disable_tls_validation }}
|
disable_tls_validation: {{ matrix_dendrite_disable_tls_validation }}
|
||||||
|
|
||||||
# Use the following proxy server for outbound federation traffic.
|
# Use the following proxy server for outbound federation traffic.
|
||||||
proxy_outbound:
|
proxy_outbound:
|
||||||
@ -282,7 +282,7 @@ signing_key_server:
|
|||||||
public_key: Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw
|
public_key: Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw
|
||||||
- key_id: ed25519:a_RXGa
|
- key_id: ed25519:a_RXGa
|
||||||
public_key: l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ
|
public_key: l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ
|
||||||
|
|
||||||
# This option will control whether Dendrite will prefer to look up keys directly
|
# This option will control whether Dendrite will prefer to look up keys directly
|
||||||
# or whether it should try perspective servers first, using direct fetches as a
|
# or whether it should try perspective servers first, using direct fetches as a
|
||||||
# last resort.
|
# last resort.
|
||||||
@ -335,8 +335,4 @@ tracing:
|
|||||||
|
|
||||||
# Logging configuration, in addition to the standard logging that is sent to
|
# Logging configuration, in addition to the standard logging that is sent to
|
||||||
# stdout by Dendrite.
|
# stdout by Dendrite.
|
||||||
logging:
|
logging: []
|
||||||
- type: file
|
|
||||||
level: {{ matrix_dendrite_log_level }}
|
|
||||||
params:
|
|
||||||
path: /var/log/dendrite
|
|
||||||
|
@ -37,7 +37,6 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
--mount type=bind,src={{ matrix_dendrite_config_dir_path }},dst=/data,ro \
|
--mount type=bind,src={{ matrix_dendrite_config_dir_path }},dst=/data,ro \
|
||||||
--mount type=bind,src={{ matrix_dendrite_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \
|
--mount type=bind,src={{ matrix_dendrite_storage_path }},dst=/matrix-media-store-parent,bind-propagation=slave \
|
||||||
--mount type=bind,src={{ matrix_dendrite_log_path }},dst=/var/log/dendrite,bind-propagation=slave \
|
|
||||||
{% for volume in matrix_dendrite_container_additional_volumes %}
|
{% for volume in matrix_dendrite_container_additional_volumes %}
|
||||||
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
|
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -9,4 +9,4 @@ fi
|
|||||||
user=$1
|
user=$1
|
||||||
password=$2
|
password=$2
|
||||||
|
|
||||||
docker exec matrix-dendrite create-account --config /data/dendrite.yaml --user "$user" --password "$password"
|
docker exec matrix-dendrite create-account --config /data/dendrite.yaml --user "$user" --password "$password"
|
||||||
|
Loading…
Reference in New Issue
Block a user