Merge pull request 'Rename matrix server components and add finalize setup configuration' (#45 ) from dev into main

Reviewed-on: #45
Merge pull request 'Add required fields and types to matrix template configuration' (#44 ) from dev into main
2025-08-31 12:27:43 +00:00 · 2025-08-31 12:19:10 +00:00 · 2025-08-31 12:15:42 +00:00 · 2025-08-31 10:22:32 +00:00 · 2025-08-31 10:18:09 +00:00 · 2025-08-30 07:49:49 +00:00
5 changed files with 36 additions and 29 deletions
--- a/matrix/domain-matrix-admin.json
+++ b/matrix/domain-matrix-admin.json
@@ -1,7 +1,7 @@
 {
    "main": {
        "SERVICE_NAME": "matrix",
-        "DOMAIN": "#ADMINDOMAIN"
+        "DOMAIN": "#DOMAIN"
    },
    "containers": [
        {
@@ -29,14 +29,11 @@
                    "PORT": "80"
                },
                {
-                    "DOMAIN": "#ADMINDOMAIN"
+                    "DOMAIN": "#DOMAIN"
                },
                {
                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
                },
-                {
-                    "LOCATION": "#SUBPATH"
-                },
                {
                    "OPERATION": "CREATE"
                }
--- a/matrix/matrix-secret.json
+++ b/matrix/matrix-secret.json
@@ -22,8 +22,6 @@
    },
    "matrixadmin": {
        "REACT_APP_SERVER": "https://#DOMAIN",
-        "BASE_PATH": "#ADMINDOMAIN",
-        "ADMINDOMAIN": "#ADMINDOMAIN",
-        "SUBPATH": "#SUBPATH"
+        "BASE_PATH": "/synapse-admin"
    }
 }
--- a/matrix/service-matrix.json
+++ b/matrix/service-matrix.json
@@ -39,7 +39,7 @@
            "VOLUMES": [
                {
                    "SOURCE": "/etc/user/data/matrix/db",
-                    "DEST": "/var/lib/postgresql/data",
+                    "DEST": "/var/lib/postgresql",
                    "TYPE": "rw"
                }
            ],
@@ -93,7 +93,7 @@
        {
            "IMAGE": "safebox/matrix-setup:latest",
            "UPDATE": "true",
-            "NAME": "matrixserver-dbinit",
+            "NAME": "matrixserver-setup",
            "NETWORK": "host",
            "MEMORY": "64M",
            "VOLUMES": [
@@ -128,6 +128,13 @@
                    "TYPE": "rw"
                }
            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "8008",
+                    "TYPE": "tcp"
+                }
+            ],
            "ENV_FILES": [
                "/etc/user/secret/matrix/matrix.json"
            ],
@@ -152,11 +159,6 @@
                    "SOURCE": "/etc/user/data/matrix/synapse",
                    "DEST": "/data",
                    "TYPE": "rw"
-                },
-                {
-                    "SOURCE": "SHARED",
-                    "DEST": "/var/tmp/shared",
-                    "TYPE": "rw"
                }
            ],
            "ENV_FILES": [
@@ -194,6 +196,29 @@
                "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"
        }
    ]
 }
--- a/matrix/template.json
+++ b/matrix/template.json
@@ -24,19 +24,6 @@
            "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",
--- a/pocketid/service-pocketid.json
+++ b/pocketid/service-pocketid.json
@@ -36,7 +36,7 @@
            "VOLUMES": [
                {
                    "SOURCE": "/etc/user/data/pocketid/db",
-                    "DEST": "/var/lib/postgresql/data",
+                    "DEST": "/var/lib/postgresql",
                    "TYPE": "rw"
                }
            ],
Author	SHA1	Message	Date
Gyorgy Berenyi	234f2b8379	Merge pull request 'Rename matrix server components and add finalize setup configuration' (#45 ) from dev into main Reviewed-on: #45	2025-08-31 12:27:43 +00:00
Gyorgy Berenyi	858ddb310a	Merge pull request 'Add required fields and types to matrix template configuration' (#44 ) from dev into main Reviewed-on: #44	2025-08-31 12:19:10 +00:00
Gyorgy Berenyi	c48ee36943	Merge pull request 'Add matrix service configuration and update related settings' (#43 ) from dev into main Reviewed-on: #43	2025-08-31 12:15:42 +00:00
Gyorgy Berenyi	b6bf808328	Merge pull request 'Refactor database connection string to enhance clarity and consistency' (#42 ) from dev into main Reviewed-on: #42	2025-08-31 10:22:32 +00:00
Gyorgy Berenyi	73419aeff8	Merge pull request 'Add initial configuration files for matrix service and firewalls' (#41 ) from dev into main Reviewed-on: #41	2025-08-31 10:18:09 +00:00
Gyorgy Berenyi	6bf99e7a1a	Merge pull request 'Update port configuration from 3000 to 1411 in domain, firewall, and service JSON files' (#40 ) from dev into main Reviewed-on: #40	2025-08-30 07:49:49 +00:00
Gyorgy Berenyi	d46cc3e801	Merge pull request 'Rename POSTGRES_CONNECTION_STRING to DB_CONNECTION_STRING in pocketid-secret.json' (#39 ) from dev into main Reviewed-on: #39	2025-08-30 07:39:42 +00:00
Gyorgy Berenyi	885d896777	Merge pull request 'Update PocketID image reference in service-pocketid.json to use versioned tag' (#38 ) from dev into main Reviewed-on: #38	2025-08-30 07:36:45 +00:00
Gyorgy Berenyi	49491e3116	Merge pull request 'Update PostgreSQL volume paths in service-pocketid.json' (#37 ) from dev into main Reviewed-on: #37	2025-08-30 07:28:35 +00:00
Gyorgy Berenyi	00d3f23702	Merge pull request 'dev' (#36 ) from dev into main Reviewed-on: #36	2025-08-30 07:23:03 +00:00
Gyorgy Berenyi	7019222a22	Merge pull request 'Refactor Vaultwarden configuration to replace MariaDB with PostgreSQL, update related keys and paths, and remove unnecessary log directory.' (#35 ) from dev into main Reviewed-on: #35	2025-08-29 15:21:12 +00:00
Gyorgy Berenyi	927d7e669e	Merge pull request 'Update Gitea service configuration to change SERVICE_NAME and DOMAIN settings' (#34 ) from dev into main Reviewed-on: #34	2025-08-29 13:39:36 +00:00
Gyorgy Berenyi	892e05fb60	Merge pull request 'Update Gitea secret configuration to change database host to 'giteapostgres-db'' (#33 ) from dev into main Reviewed-on: #33	2025-08-29 12:48:52 +00:00
Gyorgy Berenyi	ea7ee3aec9	Merge pull request 'Update Gitea configuration to replace 'gitea' with 'gitea-app' in service and firewall settings' (#32 ) from dev into main Reviewed-on: #32	2025-08-29 12:40:11 +00:00
Gyorgy Berenyi	23501f7760	Merge pull request 'Update Gitea service configuration to use latest image tag for Gitea' (#31 ) from dev into main Reviewed-on: #31	2025-08-29 12:31:30 +00:00
Gyorgy Berenyi	ecc21d1639	Merge pull request 'dev' (#30 ) from dev into main Reviewed-on: #30	2025-08-29 12:28:20 +00:00
Gyorgy Berenyi	d64872f85e	Merge pull request 'dev' (#29 ) from dev into main Reviewed-on: #29	2025-08-29 12:25:21 +00:00
Gyorgy Berenyi	e928cca06a	Merge pull request 'Refactor service configurations to improve compatibility and streamline setup process' (#28 ) from dev into main Reviewed-on: #28	2025-08-29 12:19:41 +00:00
Gyorgy Berenyi	a0cced089b	Merge pull request 'Update Nextcloud PostgreSQL image to version 15 and add Gitea configuration files for PostgreSQL and firewall services' (#27 ) from dev into main Reviewed-on: #27	2025-08-29 12:17:32 +00:00
Gyorgy Berenyi	e43b20a94c	Merge pull request 'Update Nextcloud configuration to use PostgreSQL instead of MariaDB and adjust related settings' (#26 ) from dev into main Reviewed-on: #26	2025-08-29 08:21:01 +00:00
Gyorgy Berenyi	ac7c52def1	Merge pull request 'Add .gitignore, update Redis URL and domain placeholders, and expand outline secret configuration' (#25 ) from dev into main Reviewed-on: #25	2025-08-29 06:15:38 +00:00
Gyorgy Berenyi	f26a4d60d9	Merge pull request 'Update Jellyfin service configuration to use version placeholder and add version metadata to template' (#24 ) from dev into main Reviewed-on: #24	2025-08-25 08:45:05 +00:00
Gyorgy Berenyi	2f343b4b67	Merge pull request 'Add matrix server configuration and update filebrowser command to set ownership' (#23 ) from dev into main Reviewed-on: #23	2025-08-24 06:51:34 +00:00
hael	fe5b98391b	Merge pull request 'leantime smtp transm vaultw template update' (#22 ) from dev into main Reviewed-on: #22	2025-08-14 18:14:08 +00:00
hael	9827a6bd85	Merge pull request 'Update outline/domain-outline.json' (#21 ) from dev into main Reviewed-on: #21	2025-08-14 16:24:02 +00:00
Gyorgy Berenyi	9fe2be7b26	Merge pull request 'Update Leantime configuration to change port from 80 to 8080' (#20 ) from dev into main Reviewed-on: #20	2025-08-14 15:51:43 +00:00
Gyorgy Berenyi	48a20f2681	Merge pull request 'dev' (#19 ) from dev into main Reviewed-on: #19	2025-08-14 15:32:20 +00:00
Gyorgy Berenyi	db6a375c5e	Merge pull request 'Increase memory allocation for immich services in service-immich.json' (#18 ) from dev into main Reviewed-on: #18	2025-08-12 10:34:21 +00:00
hael	7eda10b29d	Merge pull request 'Update outline/template.json' (#17 ) from dev into main Reviewed-on: #17	2025-08-07 13:24:00 +00:00