Merge pull request 'Update volume destination paths in service-matrix.json and service-pocketid.json for PostgreSQL data' (#58) from dev into main

Reviewed-on: #58

matrix/domain-matrix-admin.json

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

matrix/matrix-secret.json

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

matrix/service-matrix.json

@@ -39,7 +39,7 @@
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/matrix/db",
-                    "DEST": "/var/lib/postgresql",
+                    "DEST": "/var/lib/postgresql/data",
                     "TYPE": "rw"
                 }
             ],
@@ -68,7 +68,7 @@
         {
             "IMAGE": "matrixdotorg/synapse",
             "UPDATE": "true",
-            "NAME": "matrixserver",
+            "NAME": "matrixserver-init",
             "ROLES": "backend-www",
             "MEMORY": "512M",
             "NETWORK": "matrix-net",
@@ -93,7 +93,7 @@
         {
             "IMAGE": "safebox/matrix-setup:latest",
             "UPDATE": "true",
-            "NAME": "matrix-setup",
+            "NAME": "matrixserver-dbinit",
             "NETWORK": "host",
             "MEMORY": "64M",
             "VOLUMES": [
@@ -116,7 +116,7 @@
         {
             "IMAGE": "matrixdotorg/synapse",
             "UPDATE": "true",
-            "NAME": "matrixserver",
+            "NAME": "matrixserver-app",
             "ROLES": "backend-www",
             "MEMORY": "512M",
             "NETWORK": "matrix-net",
@@ -128,13 +128,6 @@
                     "TYPE": "rw"
                 }
             ],
-            "PORTS": [
-                {
-                    "SOURCE": "null",
-                    "DEST": "8008",
-                    "TYPE": "tcp"
-                }
-            ],
             "ENV_FILES": [
                 "/etc/user/secret/matrix/matrix.json"
             ],
@@ -148,6 +141,34 @@
                 "domain-matrix"
             ]
         },
+        {
+            "IMAGE": "safebox/matrix-setup:latest",
+            "UPDATE": "true",
+            "NAME": "matrixserver-finalize",
+            "NETWORK": "host",
+            "MEMORY": "64M",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/matrix/synapse",
+                    "DEST": "/data",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "SHARED",
+                    "DEST": "/var/tmp/shared",
+                    "TYPE": "rw"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/matrix/matrix.json"
+            ],
+            "EXTRA": "--rm",
+            "DEPEND": "null",
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
         {
             "IMAGE": "awesometechnologies/synapse-admin",
             "UPDATE": "true",
@@ -173,29 +194,6 @@
                 "firewall-matrix-admin",
                 "domain-matrix-admin"
             ]
-        },
-        {
-            "IMAGE": "safebox/matrix-setup:latest",
-            "UPDATE": "true",
-            "NAME": "matrix-setup",
-            "NETWORK": "host",
-            "MEMORY": "64M",
-            "VOLUMES": [
-                {
-                    "SOURCE": "/etc/user/data/matrix/synapse",
-                    "DEST": "/data",
-                    "TYPE": "ro"
-                }
-            ],
-            "ENV_FILES": [
-                "/etc/user/secret/matrix/matrix.json"
-            ],
-            "EXTRA": "--rm",
-            "DEPEND": "null",
-            "START_ON_BOOT": "false",
-            "CMD": "null",
-            "PRE_START": "null",
-            "POST_START": "null"
         }
     ]
 }

matrix/template.json

@@ -24,6 +24,19 @@
             "required": "true",
             "type": "password"
         },
+        {
+            "description": "Add matrix server admin domain",
+            "key": "ADMINDOMAIN",
+            "value": "",
+            "required": "true",
+            "details": "Keep it mindful if you have other services using the same domain, for example matrix domain is the same as admin domain you should set it 'admin.domain.tld' now you can access it via https://admin.domain.tld"
+        },
+        {
+            "description": "Add domain subpath for matrix admin (e.g. admin)",
+            "details": "Optional - leave it 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 you should set it '/admin/' now you can access it via https://domain.tld/admin/",
+            "key": "SUBPATH",
+            "value": ""
+        },
         {
             "description": "Postgres database name",
             "key": "POSTGRES_DB",

pocketid/service-pocketid.json

@@ -36,7 +36,7 @@
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/pocketid/db",
-                    "DEST": "/var/lib/postgresql",
+                    "DEST": "/var/lib/postgresql/data",
                     "TYPE": "rw"
                 }
             ],