From a78a749f75b96460bb296883127edf39b4371fed Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 13 Jan 2024 16:43:46 +0200 Subject: [PATCH] Define matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_server_port in the role defaults and make the tag configurable --- .../defaults/main.yml | 6 ++++++ .../templates/nginx/nginx.conf.j2 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml index d39817cef..7f61d58e1 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml @@ -131,6 +131,12 @@ matrix_synapse_reverse_proxy_companion_worker_connections: 1024 # Option to disable the access log matrix_synapse_reverse_proxy_companion_access_log_enabled: true +# Controls whether to send access logs to a remote syslog-compatible server +matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_enabled: false +matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_server_port: '' +# This is intentionally different. The maximum allowed length is 32 characters and dashes are not allowed. +matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_tag: matrix_synapse_rev_proxy_comp + # The tmpfs at /tmp needs to be large enough to handle multiple concurrent file uploads. matrix_synapse_reverse_proxy_companion_tmp_directory_size_mb: "{{ (matrix_synapse_reverse_proxy_companion_federation_api_client_max_body_size_mb | int) * 50 }}" matrix_synapse_reverse_proxy_companion_tmp_cache_directory_size_mb: "{{ (matrix_synapse_reverse_proxy_companion_synapse_cache_max_size_mb | int) * 2 }}" diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/templates/nginx/nginx.conf.j2 b/roles/custom/matrix-synapse-reverse-proxy-companion/templates/nginx/nginx.conf.j2 index 309bb5301..119227634 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/templates/nginx/nginx.conf.j2 +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/templates/nginx/nginx.conf.j2 @@ -47,7 +47,7 @@ http { '$status "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log syslog:server={{ matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_server_port }},tag=matrix_nginx_proxy_companion prometheus_fmt; + access_log syslog:server={{ matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_server_port }},tag={{ matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_tag }} prometheus_fmt; {% endif %} {% if not matrix_synapse_reverse_proxy_companion_access_log_enabled and not matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_enabled %}