Merge pull request 'Update domain keys in configuration files for consistency and clarity' (#49) from dev into main

Reviewed-on: #49

matrix/domain-matrix-admin.json

@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "matrix",
-        "DOMAIN": "#DOMAIN_ADMIN"
+        "DOMAIN": "#ADMINDOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "80"
                 },
                 {
-                    "DOMAIN": "#DOMAINADMIN"
+                    "DOMAIN": "#ADMINDOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"

matrix/matrix-secret.json

@@ -22,8 +22,8 @@
     },
     "matrixadmin": {
         "REACT_APP_SERVER": "https://#DOMAIN",
-        "BASE_PATH": "/synapse-admin",
+        "BASE_PATH": "#ADMINDOMAIN",
-        "DOMAINADMIN": "#DOMAINADMIN",
+        "ADMINDOMAIN": "#ADMINDOMAIN",
         "SUBPATH": "#SUBPATH"
     }
 }

matrix/template.json

@@ -26,14 +26,14 @@
         },
         {
             "description": "Add matrix server admin domain",
-            "key": "DOMAIN_ADMIN",
+            "key": "ADMINDOMAIN",
             "value": "",
             "required": "true"
         },
         {
             "description": "Add domain subpath for matrix admin (e.g. admin)",
             "details": "Optional - leave blank for none but keep in mind subpath will be required if you have other services using the same domain, for example matrix domain is the same as admin domain.",
-            "key": "SUB_PATH",
+            "key": "SUBPATH",
             "value": ""
         },
         {