roles/mas/defaults/main.json

@@ -1,7 +1,7 @@
 {
 	"var_mas_user": "mas",
 	"var_mas_directory": "/opt/mas",
-	"var_mas_server_address": "[::]",
+	"var_mas_server_address": "::",
 	"var_mas_server_port": 2839,
 	"var_mas_database_host": "postgresql.example.org",
 	"var_mas_database_port": 5432,

roles/mas/files/conf-compose.py

@@ -103,23 +103,16 @@ def main():
 	data = {}
 	### base
 	if True:
-		data = dict_merge(
+		data_ = _json.loads(file_read(args.base_file_path))
-			data,
+		data = dict_merge(data, data_)
-			_json.loads(file_read(args.base_file_path))
-		)
 	### clients
 	if True:
-		data = dict_merge(
+		for name in _os.listdir(args.clients_directory_path):
-			data,
+			data__ = _json.loads(file_read(_os.path.join(args.clients_directory_path, name)))
-			{
+			data_ = {
-				"clients": list(
+				"clients": data__
-					map(
-						lambda name: _json.loads(file_read(_os.path.join(args.clients_directory_path, name))),
-						_os.listdir(args.clients_directory_path)
-					)
-				),
 			}
-		)
+			data = dict_merge(data, data_)
 	## output
 	if True:
 		if (args.output_format == "json"):

roles/mas/tasks/main.json

@@ -15,7 +15,6 @@
 			"{{var_mas_directory}}/conf.d",
 			"{{var_mas_directory}}/conf.d/providers",
 			"{{var_mas_directory}}/conf.d/clients",
-			"{{var_mas_directory}}/secrets",
 			"{{var_mas_directory}}/scripts"
 		],
 		"ansible.builtin.file": {
@@ -53,15 +52,6 @@
 			"mode": "0555"
 		}
 	},
-	{
-		"name": "configuration | private key",
-		"become": true,
-		"become_user": "{{var_mas_user}}",
-		"community.crypto.openssl_privatekey": {
-			"curve": "secp384r1",
-			"path": "{{var_mas_directory}}/secrets/private_key.pem"
-		}
-	},
 	{
 		"name": "configuration | base",
 		"become": true,

roles/mas/templates/config-base.json.j2

@@ -1,7 +1,7 @@
 {
 	"database": {
 		"host": "{{var_mas_database_host}}",
-		"port": {{var_mas_database_port | string}},
+		"port": "{{var_mas_database_port | string}}",
 		"username": "{{var_mas_database_username}}",
 		"password": "{{var_mas_database_password}}",
 		"database": "{{var_mas_database_schema}}"
@@ -61,8 +61,8 @@
 			"fd00::/8",
 			"::1/128"
 		],
-		"public_base": "http://{{var_mas_server_address}}:{{var_mas_server_port | string}}/",
+		"public_base": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/",
-		"issuer": "http://{{var_mas_server_address}}:{{var_mas_server_port | string}}/"
+		"issuer": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/"
 	},
 	"matrix": {
 		"homeserver": "{{var_mas_matrix_server}}",
@@ -72,10 +72,7 @@
 	"secrets": {
 		"encryption": "{{var_mas_encryption_key}}",
 		"keys": [
-			{
+			"__TODO__"
-				"kid": "x1",
-				"key_file": "{{var_mas_directory}}/secrets/private_key.pem"
-			}
 		]
 	},
 	"passwords": {