-
Notifications
You must be signed in to change notification settings - Fork 228
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add recaptcha_{private,public}_key_path config option #17984
base: develop
Are you sure you want to change the base?
Conversation
You have configured both `recaptcha_private_key` and | ||
`recaptcha_private_key_path`. These are mutually incompatible. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can dumb this down a bit:
You have configured both `recaptcha_private_key` and | |
`recaptcha_private_key_path`. These are mutually incompatible. | |
You have configured both `recaptcha_private_key` and | |
`recaptcha_private_key_path`. Only one or the other can be specified at a time. |
You have configured both `recaptcha_private_key` and | ||
`recaptcha_private_key_path`. These are mutually incompatible. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a slight variation on the typical error message we've been using for this:
Conflicting options 'macaroon_secret_key' and 'macaroon_secret_key_path' are
both defined in config file.
I like the version that this PR has but we should probably be consistent and update all the other similar errors.
@MadLittleMods: Could you clarify what you want the error message to be? For these PRs I did not use my own wording, but took it from synapse/synapse/config/registration.py Lines 37 to 40 in aab3672
|
Another config option on my quest to a
*_path
variant for every secret. Adds the config optionsrecaptcha_private_key_path
andrecaptcha_public_key_path
. Tests and docs are included.A public key is of course no secret, but it is closely related to the private key, so it’s still useful to have a
*_path
variant for it.Pull Request Checklist
EventStore
toEventWorkerStore
.".code blocks
.(run the linters)