Compare commits

...

3 Commits

Author SHA1 Message Date
Aine cbbf20004c replace access log ip anonymization with vars to control access logs
Lock Threads / action (push) Has been cancelled
Matrix CI / yamllint (push) Has been cancelled
Matrix CI / ansible-lint (push) Has been cancelled
Matrix CI / Run pre-commit (push) Has been cancelled
2025-07-30 14:40:48 +01:00
renovate[bot] 5de4b5c657 Update docker.io/metio/matrix-alertmanager-receiver Docker tag to v2025.7.30 2025-07-30 15:49:45 +03:00
Aine e8c7091c3f update nginx configs for cinny, hydrogen, and synapse reverse proxy companion with ip anonymization 2025-07-30 12:59:42 +01:00
6 changed files with 23 additions and 7 deletions
@@ -11,7 +11,7 @@
matrix_alertmanager_receiver_enabled: true matrix_alertmanager_receiver_enabled: true
# renovate: datasource=docker depName=docker.io/metio/matrix-alertmanager-receiver # renovate: datasource=docker depName=docker.io/metio/matrix-alertmanager-receiver
matrix_alertmanager_receiver_version: 2025.7.23 matrix_alertmanager_receiver_version: 2025.7.30
matrix_alertmanager_receiver_scheme: https matrix_alertmanager_receiver_scheme: https
@@ -159,6 +159,9 @@ matrix_client_cinny_self_check_validate_certificates: true
# See `matrix_client_cinny_config_homeserverList`. # See `matrix_client_cinny_config_homeserverList`.
matrix_client_cinny_default_hs_url: "" matrix_client_cinny_default_hs_url: ""
# Controls whether the Cinny access log is enabled
matrix_client_cinny_access_log_enabled: true
# Controls the `defaultHomeserver` value in the `config.json` file. # Controls the `defaultHomeserver` value in the `config.json` file.
matrix_client_cinny_config_defaultHomeserver: 0 # noqa var-naming matrix_client_cinny_config_defaultHomeserver: 0 # noqa var-naming
@@ -32,10 +32,14 @@ http {
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
{% if matrix_client_cinny_access_log_enabled %}
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
{% else %}
access_log off;
{% endif %}
sendfile on; sendfile on;
#tcp_nopush on; #tcp_nopush on;
@@ -154,6 +154,9 @@ matrix_client_hydrogen_path_prefix: /
# Controls whether the self-check feature should validate SSL certificates. # Controls whether the self-check feature should validate SSL certificates.
matrix_client_hydrogen_self_check_validate_certificates: true matrix_client_hydrogen_self_check_validate_certificates: true
# Controls whether the access log is enabled.
matrix_client_hydrogen_access_log_enabled: true
# config.json # config.json
matrix_client_hydrogen_push: matrix_client_hydrogen_push:
appId: io.element.hydrogen.web appId: io.element.hydrogen.web
@@ -32,10 +32,14 @@ http {
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
{% if matrix_client_hydrogen_access_log_enabled %}
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
{% else %}
access_log off;
{% endif %}
sendfile on; sendfile on;
#tcp_nopush on; #tcp_nopush on;
@@ -34,11 +34,13 @@ http {
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
{% if matrix_synapse_reverse_proxy_companion_access_log_enabled %} {% if matrix_synapse_reverse_proxy_companion_access_log_enabled %}
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
{% else %}
access_log off;
{% endif %} {% endif %}
{% if matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_enabled %} {% if matrix_synapse_reverse_proxy_companion_access_log_syslog_integration_enabled %}