roles/mas/tasks/main.json

@@ -56,7 +56,7 @@
 		"become": true,
 		"become_user": "{{var_mas_user}}",
 		"ansible.builtin.template": {
-			"src": "config-main.json.j2",
+			"src": "config-main.yaml.j2",
 			"dest": "{{var_mas_directory}}/conf.d/base.yaml"
 		}
 	},

roles/synapse/defaults/main.json

@@ -20,12 +20,6 @@
 	"var_synapse_authentication_data_authelia_client_id": "synapse",
 	"var_synapse_authentication_data_authelia_client_secret": "REPLACE_ME",
 	"var_synapse_authentication_data_authelia_url_base": "https://authelia.example.org",
-	"var_synapse_authentication_data_mas_url_base": "http://localhost:2839",
-	"var_synapse_authentication_data_mas_client_id": "synapse",
-	"var_synapse_authentication_data_mas_client_secret": "REPLACE_ME",
-	"var_synapse_authentication_data_mas_admin_token": "REPLACE_ME",
-	"var_synapse_authentication_data_mas_provider_id": "mas",
-	"var_synapse_authentication_data_mas_provider_name": "MAS",
 	"var_synapse_smtp_host": "smtp.example.org",
 	"var_synapse_smtp_port": 587,
 	"var_synapse_smtp_username": "synapse@smtp.example.org",

roles/synapse/info.md

@@ -9,4 +9,3 @@ Zur Einrichtung des [matrix.org](https://matrix.org/)-Servers Synapse
 - [GitHub-Repository](https://github.com/matrix-org/synapse)
 - [Configuration Manual](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html)
 - [Dokumentation | PostgreSQL](https://matrix-org.github.io/synapse/latest/postgres.html#using-postgres)
-- [MAS-Dokumentation | Homeserver configuration](https://element-hq.github.io/matrix-authentication-service/setup/homeserver.html)

roles/synapse/templates/homeserver.yaml.j2

@@ -126,21 +126,6 @@ oidc_providers:
         email_template: "{{"{{"}} user.email {{"}}"}}"
 {% endif %}
 
-{% if var_synapse_authentication_kind == 'mas' %}
-enable_registration: false
-enable_registration_without_verification: false
-
-experimental_features:
-  msc3861:
-    enabled: true
-    issuer: "{{var_synapse_authentication_data_mas_url_base}}"
-    client_auth_method: client_secret_basic
-    client_id: "{{var_synapse_authentication_data_mas_client_id}}"
-    client_secret: "{{var_synapse_authentication_data_mas_client_secret}}"
-    admin_token: "{{var_synapse_authentication_data_mas_admin_token}}"
-    account_management_url: "{{var_synapse_authentication_data_mas_url_base}}/account"
-{% endif %}
-
 account_validity:
 
 bcrypt_rounds: 12

roles/synapse/vardef.json

@@ -71,8 +71,7 @@
 		"mandatory": false,
 		"options": [
 			"internal",
-			"authelia",
+			"authelia"
-			"mas"
 		]
 	},
 	"authentication_data_authelia_provider_id": {
@@ -95,30 +94,6 @@
 		"type": "string",
 		"mandatory": false
 	},
-	"authentication_data_mas_url_base": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_mas_client_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_mas_client_secret": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_mas_admin_token": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_mas_provider_id": {
-		"type": "string",
-		"mandatory": false
-	},
-	"authentication_data_mas_provider_name": {
-		"type": "string",
-		"mandatory": false
-	},
 	"smtp_host": {
 		"type": "string",
 		"mandatory": false