Merge pull request 'Add DOMAIN_ADMIN and SUB_PATH fields to configuration files' (#46) from dev into main

Reviewed-on: #46

matrix/domain-matrix-admin.json

@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "matrix",
-        "DOMAIN": "#DOMAIN"
+        "DOMAIN": "#DOMAIN_ADMIN"
     },
     "containers": [
         {
@@ -29,11 +29,14 @@
                     "PORT": "80"
                 },
                 {
-                    "DOMAIN": "#DOMAIN"
+                    "DOMAIN": "#DOMAIN_ADMIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
                 },
+                {
+                    "LOCAL_PATH": "#SUB_PATH"
+                },
                 {
                     "OPERATION": "CREATE"
                 }

matrix/matrix-secret.json

@@ -22,6 +22,8 @@
     },
     "matrixadmin": {
         "REACT_APP_SERVER": "https://#DOMAIN",
-        "BASE_PATH": "/synapse-admin"
+        "BASE_PATH": "/synapse-admin",
+        "DOMAIN_ADMIN": "#DOMAIN_ADMIN",
+        "SUB_PATH": "#SUB_PATH"
     }
 }

matrix/template.json

@@ -24,6 +24,18 @@
             "required": "true",
             "type": "password"
         },
+        {
+            "description": "Add matrix server admin domain",
+            "key": "DOMAIN_ADMIN",
+            "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",
+            "value": ""
+        },
         {
             "description": "Postgres database name",
             "key": "POSTGRES_DB",