Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix sample_config.yaml in regards track_puppeted_user_ips #11749

Merged
merged 5 commits into from
Jan 14, 2022
Merged

Fix sample_config.yaml in regards track_puppeted_user_ips #11749

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4637d65
Fix sample_config.yaml in regards track_puppeted_user_ips
jaywink Jan 14, 2022
d4b43d9
Remove trailing whitespace to keep flake8 happy
Jan 14, 2022
73d22c8
It would help if I regenerated the config
Jan 14, 2022
ed371c6
... and a changelog
Jan 14, 2022
52bd15e
Use the right changelog
Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11749.doc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update room spec url in config files.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't aware fixes like this to previous PR's would require changelogs, sorry. However, the changelog here doesn't seem related? 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries: the linter is merciless. It wants a changelog for every PR.

Looks like I got my PR numbers wrong, argh. Thanks for spotting!

11 changes: 6 additions & 5 deletions docs/sample_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,11 +1503,12 @@ room_prejoin_state:
#additional_event_types:
# - org.example.custom.event.type

# If enabled, puppeted user IP's can also be tracked. By default when
# puppeting another user, the user who has created the access token
# for puppeting is tracked. If this is enabled, both requests are tracked.
# Implicitly enables MAU tracking for puppeted users.
#track_puppeted_user_ips: false
# By default when puppeting another user, the user who has created the
# access token for puppeting is tracked. If this is enabled, both
# requests are tracked. Implicitly enables MAU tracking for puppeted users.
# Uncomment to also track puppeted user IP's.
#
#track_puppeted_user_ips: true


# A list of application service config files to use
Expand Down
11 changes: 6 additions & 5 deletions synapse/config/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ def generate_config_section(cls, **kwargs) -> str:
#additional_event_types:
# - org.example.custom.event.type

# If enabled, puppeted user IP's can also be tracked. By default when
# puppeting another user, the user who has created the access token
# for puppeting is tracked. If this is enabled, both requests are tracked.
# Implicitly enables MAU tracking for puppeted users.
#track_puppeted_user_ips: false
# By default when puppeting another user, the user who has created the
# access token for puppeting is tracked. If this is enabled, both
# requests are tracked. Implicitly enables MAU tracking for puppeted users.
# Uncomment to also track puppeted user IP's.
#
#track_puppeted_user_ips: true
""" % {
"formatted_default_state_types": formatted_default_state_types
}
Expand Down