Add matrix service configuration and update related settings

matrix/domain-matrix.json

@@ -0,0 +1,60 @@
+{
+    "main": {
+        "SERVICE_NAME": "matrix",
+        "DOMAIN": "#DOMAIN"
+    },
+    "containers": [
+        {
+            "IMAGE": "safebox/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "matrixserver"
+                },
+                {
+                    "PORT": "8008"
+                },
+                {
+                    "DOMAIN": "#DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}

matrix/matrix-secret.json

@@ -15,7 +15,10 @@
         "SYNAPSE_SERVER_NAME": "#DOMAIN",
         "SYNAPSE_REPORT_STATS": "no",
         "ADMIN_USERNAME": "#ADMIN_USERNAME",
-        "ADMIN_PASSWORD": "#ADMIN_PASSWORD"
+        "ADMIN_PASSWORD": "#ADMIN_PASSWORD",
+        "SYNAPSE_CONFIG_DIR": "/data",
+        "SYNAPSE_CONFIG_PATH": "/data/homeserver.yaml",
+        "SYNAPSE_DATA_DIR": "/data"
     },
     "matrixadmin": {
         "REACT_APP_SERVER": "https://#DOMAIN",

matrix/service-matrix.json

@@ -38,8 +38,8 @@
             "SELECTOR": "matrixpostgres-db",
             "VOLUMES": [
                 {
-                    "SOURCE": "/etc/user/data/matrix/postgresql",
-                    "DEST": "/var/lib/postgresql/data",
+                    "SOURCE": "/etc/user/data/matrix/db",
+                    "DEST": "/var/lib/postgresql",
                     "TYPE": "rw"
                 }
             ],
@@ -68,7 +68,7 @@
         {
             "IMAGE": "matrixdotorg/synapse",
             "UPDATE": "true",
-            "NAME": "matrixserver-init",
+            "NAME": "matrixserver",
             "ROLES": "backend-www",
             "MEMORY": "512M",
             "NETWORK": "matrix-net",
@@ -85,8 +85,8 @@
             "EXTRA": "--rm",
             "DEPEND": "null",
             "START_ON_BOOT": "false",
-            "ENTRYPOINT": "sh -c",
-            "CMD": "if [ ! -f /data/homeserver.yaml ]; then generate ; fi",
+            "ENTRYPOINT": "bash -c",
+            "CMD": "if [ ! -f /data/homeserver.yaml ]; then /start.py generate ; else exit 1; fi",
             "PRE_START": [],
             "POST_START": []
         },

matrix/template.json

@@ -6,10 +6,20 @@
     "description": "Matrix is an opensource commucation platform that provides secure messaging. It is designed to be decentralized, allowing users to communicate across different servers and platforms while maintaining control over their data.",
     "fields": [
         {
-            "description": "Domain",
+            "description": "Add synapse/matrix server name (domain)",
             "key": "DOMAIN",
             "value": ""
         },
+        {
+            "description": "Matrix admin username",
+            "key": "ADMIN_USERNAME",
+            "value": ""
+        },
+        {
+            "description": "Matrix admin password",
+            "key": "ADMIN_PASSWORD",
+            "value": ""
+        },
         {
             "description": "Postgres database name",
             "key": "POSTGRES_DB",