tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix sample_config.yaml in regards track_puppeted_user_ips (#11749)

Browse source 
* Fix sample_config.yaml in regards track_puppeted_user_ips

Closes #11741

Signed-off-by: Jason Robinson <jasonr@matrix.org>
This commit is contained in:
Jason Robinson 2022-01-14 16:11:55 +02:00 committed by GitHub
parent 3e0536cd2a
commit 904bb04409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/11749.feature Normal file
View file

@ -0,0 +1 @@
Add `track_puppeted_user_ips` config flag to track puppeted user IP addresses. This also includes them in monthly active user counts.

11
docs/sample_config.yaml
View file

@ -1503,11 +1503,12 @@ room_prejoin_state:
#additional_event_types: #additional_event_types:
# - org.example.custom.event.type # - org.example.custom.event.type
# If enabled, puppeted user IP's can also be tracked. By default when # By default when puppeting another user, the user who has created the
# puppeting another user, the user who has created the access token # access token for puppeting is tracked. If this is enabled, both
# for puppeting is tracked. If this is enabled, both requests are tracked. # requests are tracked. Implicitly enables MAU tracking for puppeted users.
# Implicitly enables MAU tracking for puppeted users. # Uncomment to also track puppeted user IP's.
#track_puppeted_user_ips: false #
#track_puppeted_user_ips: true
# A list of application service config files to use # A list of application service config files to use

11
synapse/config/api.py
View file

@ -61,11 +61,12 @@ class ApiConfig(Config):
#additional_event_types: #additional_event_types:
# - org.example.custom.event.type # - org.example.custom.event.type
# If enabled, puppeted user IP's can also be tracked. By default when # By default when puppeting another user, the user who has created the
# puppeting another user, the user who has created the access token # access token for puppeting is tracked. If this is enabled, both
# for puppeting is tracked. If this is enabled, both requests are tracked. # requests are tracked. Implicitly enables MAU tracking for puppeted users.
# Implicitly enables MAU tracking for puppeted users. # Uncomment to also track puppeted user IP's.
#track_puppeted_user_ips: false #
#track_puppeted_user_ips: true
""" % { """ % {
"formatted_default_state_types": formatted_default_state_types "formatted_default_state_types": formatted_default_state_types
} }