Move specific configurations to matrix_servers

Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>

group_vars/matrix_servers

@@ -5020,6 +5020,8 @@ synapse_admin_container_labels_traefik_tls_certResolver: "{{ traefik_certResolve
 
 synapse_admin_config_externalAuthProvider: "{{ matrix_authentication_service_enabled | default(false) or matrix_synapse_ext_password_provider_ldap_enabled | default(false) }}"
 
+synapse_admin_config_restrictBaseUrl: "{{ matrix_homeserver_url }}"  # noqa var-naming
+
 synapse_admin_config_asManagedUsers_auto: |
   {{
     ([
@@ -5177,6 +5179,8 @@ synapse_admin_base_path: "{{ matrix_base_data_path }}/synapse-admin"
 
 synapse_admin_hostname: "{{ matrix_server_fqn_matrix }}"
 
+synapse_admin_path_prefix: /synapse-admin
+
 ######################################################################
 #
 # /synapse_admin

roles/custom/matrix-synapse-admin/defaults/main.yml

@@ -144,10 +144,6 @@ synapse_admin_floc_optout_enabled: true
 # See: `synapse_admin_http_header_strict_transport_security`
 synapse_admin_hsts_preload_enabled: false
 
-# The path at which Synapse Admin is exposed.
-# This value must either be `/` or not end with a slash (e.g. `/synapse-admin`).
-synapse_admin_path_prefix: /synapse-admin
-
 # Default synapse-admin configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
 #
@@ -189,10 +185,6 @@ synapse_admin_configuration_extension: "{{ synapse_admin_configuration_extension
 # You most likely don't need to touch this variable. Instead, see `synapse_admin_configuration_default`.
 synapse_admin_configuration: "{{ synapse_admin_configuration_default | combine(synapse_admin_configuration_extension, recursive=True) }}"
 
-# Controls the restrictBaseUrl configuration setting, which, if defined,
-# restricts the homeserver(s), so that the user can no longer define a homeserver manually during login.
-synapse_admin_config_restrictBaseUrl: "{{ matrix_homeserver_url }}"  # noqa var-naming
-
 # Controls the externalAuthProvider configuration setting, which, if defined,
 # enables a special compatibility mode that works better for external auth providers like LDAP, MAS, etc.
 synapse_admin_config_externalAuthProvider: false  # noqa var-naming