From ccd3dc7a573ad136ecfad1b386fafadc64281213 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 27 Oct 2021 14:14:21 +0300
Subject: [PATCH] Remove Dendrite file logging

We refrain from logging to files for all components,
because we rely on systemd-journald anyway.
---
 roles/matrix-dendrite/defaults/main.yml       |  4 ----
 .../tasks/dendrite/setup_install.yml          |  8 -------
 .../templates/dendrite/dendrite.yaml.j2       | 22 ++++++++-----------
 .../systemd/matrix-dendrite.service.j2        |  1 -
 .../matrix-dendrite-create-account.j2         |  2 +-
 5 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/roles/matrix-dendrite/defaults/main.yml b/roles/matrix-dendrite/defaults/main.yml
index 4f7f6a926..1d80e0b0c 100644
--- a/roles/matrix-dendrite/defaults/main.yml
+++ b/roles/matrix-dendrite/defaults/main.yml
@@ -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.
 matrix_dendrite_tmp_directory_size_mb: 500
 
-# Log levels
-matrix_dendrite_log_level: "warning"
-matrix_dendrite_log_path: "/var/log/dendrite"
-
 # Rate limits
 matrix_dendrite_rate_limiting_enabled: true
 matrix_dendrite_rate_limiting_threshold: 5
diff --git a/roles/matrix-dendrite/tasks/dendrite/setup_install.yml b/roles/matrix-dendrite/tasks/dendrite/setup_install.yml
index 182b6c1c0..2752d51ed 100644
--- a/roles/matrix-dendrite/tasks/dendrite/setup_install.yml
+++ b/roles/matrix-dendrite/tasks/dendrite/setup_install.yml
@@ -17,14 +17,6 @@
     group: "{{ matrix_user_groupname }}"
   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
   docker_image:
     name: "{{ matrix_dendrite_docker_image }}"
diff --git a/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 b/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
index 2ec6c088f..5a127fb7e 100644
--- a/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
+++ b/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
@@ -6,7 +6,7 @@
 #
 # 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
-# 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
 # for "connection_string":
@@ -21,13 +21,13 @@
 # small number of users and likely will perform worse still with a higher volume
 # 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
 # engine default, and a negative value will use unlimited connections. The
 # "conn_max_lifetime" option controls the maximum length of time a database
 # 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
 
 # Global Matrix configuration. This configuration applies to all components.
@@ -133,13 +133,13 @@ client_api:
   # Whether to require reCAPTCHA for registration.
   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_private_key: {{ matrix_dendrite_recaptcha_private_key|to_json }}
   recaptcha_bypass_secret: ""
   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_user_lifetime: ""
     turn_uris: {{ matrix_dendrite_turn_uris|to_json }}
@@ -148,7 +148,7 @@ client_api:
     turn_password: ""
 
   # 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.
   rate_limiting:
     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
   # 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.
   proxy_outbound:
@@ -282,7 +282,7 @@ signing_key_server:
       public_key: Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw
     - key_id: ed25519:a_RXGa
       public_key: l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ
-      
+
   # 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
   # last resort.
@@ -335,8 +335,4 @@ tracing:
 
 # Logging configuration, in addition to the standard logging that is sent to
 # stdout by Dendrite.
-logging:
-- type: file
-  level: {{ matrix_dendrite_log_level }}
-  params:
-    path: /var/log/dendrite
+logging: []
diff --git a/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2 b/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
index 66a7c1f82..b41f6c2c5 100644
--- a/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
+++ b/roles/matrix-dendrite/templates/dendrite/systemd/matrix-dendrite.service.j2
@@ -37,7 +37,6 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-dendrite \
 			{% endif %}
 			--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_log_path }},dst=/var/log/dendrite,bind-propagation=slave \
 			{% for volume in matrix_dendrite_container_additional_volumes %}
 			-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
 			{% endfor %}
diff --git a/roles/matrix-dendrite/templates/dendrite/usr-local-bin/matrix-dendrite-create-account.j2 b/roles/matrix-dendrite/templates/dendrite/usr-local-bin/matrix-dendrite-create-account.j2
index ebacb681c..d9572ac7b 100644
--- a/roles/matrix-dendrite/templates/dendrite/usr-local-bin/matrix-dendrite-create-account.j2
+++ b/roles/matrix-dendrite/templates/dendrite/usr-local-bin/matrix-dendrite-create-account.j2
@@ -9,4 +9,4 @@ fi
 user=$1
 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"