bw/matrix-dimension switch to generic vhost name
This commit is contained in:
parent
71a1a4d59b
commit
aa639dc913
3 changed files with 5 additions and 4 deletions
|
@ -34,13 +34,14 @@ defaults = {
|
||||||
}
|
}
|
||||||
|
|
||||||
@metadata_reactor.provides(
|
@metadata_reactor.provides(
|
||||||
'nginx/vhosts',
|
'nginx/vhosts/matrix-dimension',
|
||||||
)
|
)
|
||||||
def nginx_config(metadata):
|
def nginx_config(metadata):
|
||||||
return {
|
return {
|
||||||
'nginx': {
|
'nginx': {
|
||||||
'vhosts': {
|
'vhosts': {
|
||||||
metadata.get('matrix-dimension/url'): {
|
'matrix-dimension': {
|
||||||
|
'domain': metadata.get('matrix-dimension/url'),
|
||||||
'webroot': '/var/www/{}/webapp/'.format(metadata.get('matrix-dimension/url')),
|
'webroot': '/var/www/{}/webapp/'.format(metadata.get('matrix-dimension/url')),
|
||||||
'do_not_set_content_security_headers': True,
|
'do_not_set_content_security_headers': True,
|
||||||
'max_body_size': '50M',
|
'max_body_size': '50M',
|
||||||
|
|
|
@ -109,7 +109,7 @@ nodes['htz-cloud.miniserver'] = {
|
||||||
'version': 'master', # doesn't have releases yet
|
'version': 'master', # doesn't have releases yet
|
||||||
'homeserver': {
|
'homeserver': {
|
||||||
'name': 'sophies-kitchen.eu',
|
'name': 'sophies-kitchen.eu',
|
||||||
'clientServeUrl': 'https://matrix.sophies-kitchen.eu',
|
'clientServerUrl': 'https://matrix.sophies-kitchen.eu',
|
||||||
'accessToken': vault.decrypt('encrypt$gAAAAABg4btB0KGk068ahGZzR0w_Lm1bj1wUbB2WfNNs2bp3PwM4Ftp6MjQnrF-CejZfrF0NjPJw9Z4MrgileHP0sVw04mvgKSHfTf8gv4kTB6WuCIxHeMWHUDx00LTWL73fSlhCK0o1'),
|
'accessToken': vault.decrypt('encrypt$gAAAAABg4btB0KGk068ahGZzR0w_Lm1bj1wUbB2WfNNs2bp3PwM4Ftp6MjQnrF-CejZfrF0NjPJw9Z4MrgileHP0sVw04mvgKSHfTf8gv4kTB6WuCIxHeMWHUDx00LTWL73fSlhCK0o1'),
|
||||||
},
|
},
|
||||||
'admins': [
|
'admins': [
|
||||||
|
@ -180,7 +180,7 @@ nodes['htz-cloud.miniserver'] = {
|
||||||
},
|
},
|
||||||
'nginx': {
|
'nginx': {
|
||||||
'vhosts': {
|
'vhosts': {
|
||||||
'dimension.sophies-kitchen.eu': {
|
'matrix-dimension': {
|
||||||
'extras': True,
|
'extras': True,
|
||||||
},
|
},
|
||||||
'sophies-kitchen.eu': {
|
'sophies-kitchen.eu': {
|
||||||
|
|
Loading…
Reference in a new issue