kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

matrix-dimension #43

Closed
sophie wants to merge 15 commits from matrix-dimension into main
pull from: matrix-dimension
merge into: kunsi:main
Conversation 0 Commits 15 Files changed 8 +5 -4
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a65301ee89 - Show all commits

5
bundles/matrix-dimension/metadata.py
View file

@ -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': {
kunsi marked this conversation as resolved Outdated
kunsi commented 2021-07-04 18:33:19 +00:00
Outdated
Review
Copy link

Please use a generic vhost name (like the bundle name), then set domain key inside. Remember to adjust .provides() accordingly.

Please use a generic vhost name (like the bundle name), then set `domain` key inside. Remember to adjust `.provides()` accordingly.
sophie commented 2021-07-04 19:12:09 +00:00
Outdated
Review
Copy link

Resolved in a65301ee89

Resolved in `a65301ee89`
'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',

0
data/nginx/files/extras/htz-cloud.miniserver/dimension.sophies-kitchen.eu → data/nginx/files/extras/htz-cloud.miniserver/matrix-dimension
View file

4
nodes/htz-cloud/miniserver.py
View file

@ -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': {