renamed captcha vars to new naming scheme

docs/configuring-captcha.md

@@ -25,9 +25,9 @@ matrix_synapse_recaptcha_public_key: 'YOUR_SITE_KEY'
 matrix_synapse_recaptcha_private_key: 'YOUR_SECRET_KEY'
 
 # for Dendrite
-matrix_dendrite_enable_registration_captcha: true
-matrix_dendrite_recaptcha_public_key: 'YOUR_SITE_KEY'
-matrix_dendrite_recaptcha_private_key: 'YOUR_SECRET_KEY'
+matrix_dendrite_client_api_enable_registration_captcha: true
+matrix_dendrite_client_api_recaptcha_public_key: 'YOUR_SITE_KEY'
+matrix_dendrite_client_api_recaptcha_private_key: 'YOUR_SECRET_KEY'
 ```
 
 ## hCaptcha
@@ -41,12 +41,12 @@ Requires a site/secret key pair from:
 ### Setting hCaptcha keys
 
 ```yaml
-matrix_dendrite_enable_registration_captcha: true
-matrix_dendrite_recaptcha_public_key: 'YOUR_SITE_KEY'
-matrix_dendrite_recaptcha_private_key: 'YOUR_SECRET_KEY'
-
-matrix_dendrite_recaptcha_siteverify_api: 'https://hcaptcha.com/siteverify'
-matrix_dendrite_recaptcha_api_js_url: 'https://js.hcaptcha.com/1/api.js'
-matrix_dendrite_recaptcha_form_field: 'h-captcha-response'
-matrix_dendrite_recaptcha_sitekey_class: 'h-captcha'
+matrix_dendrite_client_api_enable_registration_captcha: true
+matrix_dendrite_client_api_recaptcha_public_key: 'YOUR_SITE_KEY'
+matrix_dendrite_client_api_recaptcha_private_key: 'YOUR_SECRET_KEY'
+
+matrix_dendrite_client_api_recaptcha_siteverify_api: 'https://hcaptcha.com/siteverify'
+matrix_dendrite_client_api_recaptcha_api_js_url: 'https://js.hcaptcha.com/1/api.js'
+matrix_dendrite_client_api_recaptcha_form_field: 'h-captcha-response'
+matrix_dendrite_client_api_recaptcha_sitekey_class: 'h-captcha'
 ```

roles/custom/matrix-dendrite/defaults/main.yml

@@ -97,13 +97,13 @@ matrix_dendrite_rate_limiting_cooloff_ms: 500
 matrix_dendrite_registration_disabled: true
 
 # reCAPTCHA API for validating registration attempts
-matrix_dendrite_enable_registration_captcha: false
-matrix_dendrite_recaptcha_public_key: ""
-matrix_dendrite_recaptcha_private_key: ""
-matrix_dendrite_recaptcha_siteverify_api: ""
-matrix_dendrite_recaptcha_api_js_url: ""
-matrix_dendrite_recaptcha_form_field: ""
-matrix_dendrite_recaptcha_sitekey_class: ""
+matrix_dendrite_client_api_enable_registration_captcha: false
+matrix_dendrite_client_api_recaptcha_public_key: ""
+matrix_dendrite_client_api_recaptcha_private_key: ""
+matrix_dendrite_client_api_recaptcha_siteverify_api: ""
+matrix_dendrite_client_api_recaptcha_api_js_url: ""
+matrix_dendrite_client_api_recaptcha_form_field: ""
+matrix_dendrite_client_api_recaptcha_sitekey_class: ""
 
 # A list of additional "volumes" to mount in the container.
 # This list gets populated dynamically based on Dendrite extensions that have been enabled.

roles/custom/matrix-dendrite/templates/dendrite/dendrite.yaml.j2

@@ -189,13 +189,13 @@ client_api:
   enable_registration_captcha: {{ matrix_dendrite_enable_registration_captcha|to_json }}
 
   # Settings for ReCAPTCHA.
-  recaptcha_public_key: {{ matrix_dendrite_recaptcha_public_key|to_json }}
-  recaptcha_private_key: {{ matrix_dendrite_recaptcha_private_key|to_json }}
+  recaptcha_public_key: {{ matrix_dendrite_client_api_recaptcha_public_key|to_json }}
+  recaptcha_private_key: {{ matrix_dendrite_client_api_recaptcha_private_key|to_json }}
   recaptcha_bypass_secret: ""
-  recaptcha_siteverify_api: {{ matrix_dendrite_recaptcha_siteverify_api|to_json }}
-  recaptcha_api_js_url: {{ matrix_dendrite_recaptcha_api_js_url | to_json }}
-  recaptcha_form_field: {{ matrix_dendrite_recaptcha_form_field | to_json }}
-  recaptcha_sitekey_class: {{ matrix_dendrite_recaptcha_sitekey_class | to_json }}
+  recaptcha_siteverify_api: {{ matrix_dendrite_client_api_recaptcha_siteverify_api|to_json }}
+  recaptcha_api_js_url: {{ matrix_dendrite_client_api_recaptcha_api_js_url | to_json }}
+  recaptcha_form_field: {{ matrix_dendrite_client_api_recaptcha_form_field | to_json }}
+  recaptcha_sitekey_class: {{ matrix_dendrite_client_api_recaptcha_sitekey_class | to_json }}
 
   # TURN server information that this homeserver should send to clients.
   turn: