diff --git a/bundles/matrix-dimension/metadata.py b/bundles/matrix-dimension/metadata.py index ed7392a..ddcdbd0 100644 --- a/bundles/matrix-dimension/metadata.py +++ b/bundles/matrix-dimension/metadata.py @@ -34,13 +34,14 @@ defaults = { } @metadata_reactor.provides( - 'nginx/vhosts', + 'nginx/vhosts/matrix-dimension', ) def nginx_config(metadata): return { 'nginx': { 'vhosts': { - metadata.get('matrix-dimension/url'): { + 'matrix-dimension': { + 'domain': metadata.get('matrix-dimension/url'), 'webroot': '/var/www/{}/webapp/'.format(metadata.get('matrix-dimension/url')), 'do_not_set_content_security_headers': True, 'max_body_size': '50M', diff --git a/data/nginx/files/extras/htz-cloud.miniserver/dimension.sophies-kitchen.eu b/data/nginx/files/extras/htz-cloud.miniserver/matrix-dimension similarity index 100% rename from data/nginx/files/extras/htz-cloud.miniserver/dimension.sophies-kitchen.eu rename to data/nginx/files/extras/htz-cloud.miniserver/matrix-dimension diff --git a/nodes/htz-cloud/miniserver.py b/nodes/htz-cloud/miniserver.py index 0a104d4..cb2ec71 100644 --- a/nodes/htz-cloud/miniserver.py +++ b/nodes/htz-cloud/miniserver.py @@ -109,7 +109,7 @@ nodes['htz-cloud.miniserver'] = { 'version': 'master', # doesn't have releases yet 'homeserver': { 'name': 'sophies-kitchen.eu', - 'clientServeUrl': 'https://matrix.sophies-kitchen.eu', + 'clientServerUrl': 'https://matrix.sophies-kitchen.eu', 'accessToken': vault.decrypt('encrypt$gAAAAABg4btB0KGk068ahGZzR0w_Lm1bj1wUbB2WfNNs2bp3PwM4Ftp6MjQnrF-CejZfrF0NjPJw9Z4MrgileHP0sVw04mvgKSHfTf8gv4kTB6WuCIxHeMWHUDx00LTWL73fSlhCK0o1'), }, 'admins': [ @@ -180,7 +180,7 @@ nodes['htz-cloud.miniserver'] = { }, 'nginx': { 'vhosts': { - 'dimension.sophies-kitchen.eu': { + 'matrix-dimension': { 'extras': True, }, 'sophies-kitchen.eu': {