Compare commits

..

10 Commits

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"
}
],