Compare commits
27 Commits
dev
...
c48ee36943
Author | SHA1 | Date | |
---|---|---|---|
c48ee36943 | |||
b6bf808328 | |||
73419aeff8 | |||
6bf99e7a1a | |||
d46cc3e801 | |||
885d896777 | |||
49491e3116 | |||
00d3f23702 | |||
7019222a22 | |||
927d7e669e | |||
892e05fb60 | |||
ea7ee3aec9 | |||
23501f7760 | |||
ecc21d1639 | |||
d64872f85e | |||
e928cca06a | |||
a0cced089b | |||
e43b20a94c | |||
ac7c52def1 | |||
f26a4d60d9 | |||
2f343b4b67 | |||
fe5b98391b | |||
9827a6bd85 | |||
9fe2be7b26 | |||
48a20f2681 | |||
db6a375c5e | |||
7eda10b29d |
@@ -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"
|
||||
}
|
||||
|
@@ -22,8 +22,6 @@
|
||||
},
|
||||
"matrixadmin": {
|
||||
"REACT_APP_SERVER": "https://#DOMAIN",
|
||||
"BASE_PATH": "#ADMINDOMAIN",
|
||||
"ADMINDOMAIN": "#ADMINDOMAIN",
|
||||
"SUBPATH": "#SUBPATH"
|
||||
"BASE_PATH": "/synapse-admin"
|
||||
}
|
||||
}
|
@@ -39,7 +39,7 @@
|
||||
"VOLUMES": [
|
||||
{
|
||||
"SOURCE": "/etc/user/data/matrix/db",
|
||||
"DEST": "/var/lib/postgresql/data",
|
||||
"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",
|
||||
@@ -93,7 +93,7 @@
|
||||
{
|
||||
"IMAGE": "safebox/matrix-setup:latest",
|
||||
"UPDATE": "true",
|
||||
"NAME": "matrixserver-dbinit",
|
||||
"NAME": "matrix-setup",
|
||||
"NETWORK": "host",
|
||||
"MEMORY": "64M",
|
||||
"VOLUMES": [
|
||||
@@ -116,7 +116,7 @@
|
||||
{
|
||||
"IMAGE": "matrixdotorg/synapse",
|
||||
"UPDATE": "true",
|
||||
"NAME": "matrixserver-app",
|
||||
"NAME": "matrixserver",
|
||||
"ROLES": "backend-www",
|
||||
"MEMORY": "512M",
|
||||
"NETWORK": "matrix-net",
|
||||
@@ -128,6 +128,13 @@
|
||||
"TYPE": "rw"
|
||||
}
|
||||
],
|
||||
"PORTS": [
|
||||
{
|
||||
"SOURCE": "null",
|
||||
"DEST": "8008",
|
||||
"TYPE": "tcp"
|
||||
}
|
||||
],
|
||||
"ENV_FILES": [
|
||||
"/etc/user/secret/matrix/matrix.json"
|
||||
],
|
||||
@@ -141,34 +148,6 @@
|
||||
"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",
|
||||
@@ -194,6 +173,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"
|
||||
}
|
||||
]
|
||||
}
|
@@ -8,33 +8,16 @@
|
||||
{
|
||||
"description": "Add synapse/matrix server name (domain)",
|
||||
"key": "DOMAIN",
|
||||
"value": "",
|
||||
"required": "true"
|
||||
"value": ""
|
||||
},
|
||||
{
|
||||
"description": "Matrix admin username",
|
||||
"key": "ADMIN_USERNAME",
|
||||
"value": "",
|
||||
"required": "true"
|
||||
"value": ""
|
||||
},
|
||||
{
|
||||
"description": "Matrix admin password",
|
||||
"key": "ADMIN_PASSWORD",
|
||||
"value": "",
|
||||
"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": ""
|
||||
},
|
||||
{
|
||||
|
@@ -36,7 +36,7 @@
|
||||
"VOLUMES": [
|
||||
{
|
||||
"SOURCE": "/etc/user/data/pocketid/db",
|
||||
"DEST": "/var/lib/postgresql/data",
|
||||
"DEST": "/var/lib/postgresql",
|
||||
"TYPE": "rw"
|
||||
}
|
||||
],
|
||||
|
Reference in New Issue
Block a user