Compare commits

...

20 Commits

Author SHA1 Message Date
366fa1d6b8 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
2025-09-02 12:16:51 +00:00
gyurix
f5130b0c57 Update volume destination paths in service-matrix.json and service-pocketid.json for PostgreSQL data 2025-09-02 14:16:22 +02:00
082ae8fcf8 Merge pull request 'Update EXTRA configuration in service-matrix.json for container cleanup' (#57) from dev into main
Reviewed-on: #57
2025-09-02 09:50:06 +00:00
gyurix
1ef0fd1f5c Update EXTRA configuration in service-matrix.json for container cleanup 2025-09-02 11:31:52 +02:00
984a61d036 Merge pull request 'Remove unnecessary EXTRA configuration from service-matrix.json' (#56) from dev into main
Reviewed-on: #56
2025-09-02 09:17:42 +00:00
gyurix
ca41276ecf Remove unnecessary EXTRA configuration from service-matrix.json 2025-09-02 11:14:15 +02:00
08c4e49d82 Merge pull request 'Update volume mapping in service-matrix.json for improved clarity' (#55) from dev into main
Reviewed-on: #55
2025-09-02 09:09:09 +00:00
gyurix
7a2a4e90ed Update volume mapping in service-matrix.json for improved clarity 2025-09-02 11:08:41 +02:00
b232e22427 Merge pull request 'Remove unused PORTS configuration from service-matrix.json' (#54) from dev into main
Reviewed-on: #54
2025-09-02 08:56:46 +00:00
gyurix
4bb61da615 Remove unused PORTS configuration from service-matrix.json 2025-09-02 10:56:19 +02:00
2649856b30 Merge pull request 'Rename matrixserver-setup to matrixserver-dbinit and add new volume mapping for input data' (#53) from dev into main
Reviewed-on: #53
2025-09-02 08:35:00 +00:00
gyurix
e3862bbeb7 Rename matrixserver-setup to matrixserver-dbinit and add new volume mapping for input data 2025-09-02 10:33:26 +02:00
bf944dee1b Merge pull request 'Refactor configuration file structure for enhanced readability and organization' (#52) from dev into main
Reviewed-on: #52
2025-09-01 14:23:30 +00:00
gyurix
fc0197dcf1 Refactor configuration file structure for enhanced readability and organization 2025-09-01 16:22:29 +02:00
bc26466fab Merge pull request 'Update SUBPATH details in template.json for clearer usage instructions' (#51) from dev into main
Reviewed-on: #51
2025-09-01 08:18:31 +00:00
gyurix
c30a5ceadb Update SUBPATH details in template.json for clearer usage instructions 2025-09-01 10:17:54 +02:00
24b9f416b5 Merge pull request 'Rename LOCAL_PATH to LOCATION in domain-matrix-admin.json for clarity' (#50) from dev into main
Reviewed-on: #50
2025-09-01 08:10:32 +00:00
gyurix
fcc452af8a Rename LOCAL_PATH to LOCATION in domain-matrix-admin.json for clarity 2025-09-01 10:09:57 +02:00
5598cd2e4e Merge pull request 'Update domain keys in configuration files for consistency and clarity' (#49) from dev into main
Reviewed-on: #49
2025-09-01 08:06:01 +00:00
gyurix
daaa19d32a Update domain keys in configuration files for consistency and clarity 2025-09-01 10:05:22 +02:00
5 changed files with 19 additions and 43 deletions

View File

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

View File

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

View File

@@ -39,7 +39,7 @@
"VOLUMES": [
{
"SOURCE": "/etc/user/data/matrix/db",
"DEST": "/var/lib/postgresql",
"DEST": "/var/lib/postgresql/data",
"TYPE": "rw"
}
],
@@ -93,7 +93,7 @@
{
"IMAGE": "safebox/matrix-setup:latest",
"UPDATE": "true",
"NAME": "matrixserver-setup",
"NAME": "matrixserver-dbinit",
"NETWORK": "host",
"MEMORY": "64M",
"VOLUMES": [
@@ -128,13 +128,6 @@
"TYPE": "rw"
}
],
"PORTS": [
{
"SOURCE": "null",
"DEST": "8008",
"TYPE": "tcp"
}
],
"ENV_FILES": [
"/etc/user/secret/matrix/matrix.json"
],
@@ -159,6 +152,11 @@
"SOURCE": "/etc/user/data/matrix/synapse",
"DEST": "/data",
"TYPE": "rw"
},
{
"SOURCE": "SHARED",
"DEST": "/var/tmp/shared",
"TYPE": "rw"
}
],
"ENV_FILES": [
@@ -196,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"
}
]
}

File diff suppressed because one or more lines are too long

View File

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