matrix-dimension #44

Merged
sophie merged 16 commits from matrix-dimension into main 2021-07-17 09:58:18 +00:00
2 changed files with 6 additions and 7 deletions
Showing only changes of commit 58691904fc - Show all commits

View file

@ -16,14 +16,14 @@ git_deploy = {
'action:matrix_dimension_build', 'action:matrix_dimension_build',
}, },
'needs': { 'needs': {
'directory:{}'.format(node.metadatai.get('matrix-dimension/install_dir'), 'directory:{}'.format(node.metadata.get('matrix-dimension/install_dir')),
'directory:{}'.format(node.metadata.get('matrix-dimension/data_dir'), 'directory:{}'.format(node.metadata.get('matrix-dimension/data_dir')),
}, },
}, },
} }
files = { files = {
'{}/config/production.yaml'.format(node.metadata.get('matrix-dimension/install_dir'): { '{}/config/production.yaml'.format(node.metadata.get('matrix-dimension/install_dir')): {
'owner': 'matrix-dimension', 'owner': 'matrix-dimension',
'group': 'matrix-dimension', 'group': 'matrix-dimension',
'content_type': 'mako', 'content_type': 'mako',
@ -31,8 +31,7 @@ files = {
'config': node.metadata.get('matrix-dimension', {}), 'config': node.metadata.get('matrix-dimension', {}),
}, },
'needs': { 'needs': {
'action:element-web_yarn', 'directory:{}'.format(node.metadata.get('matrix-dimension/install_dir')),
'directory:{}'.format(node.metadata.get('matrix-dimension/install_dir'),
}, },
'triggers': { 'triggers': {
'svc_systemd:matrix-dimension:restart', 'svc_systemd:matrix-dimension:restart',
@ -67,7 +66,7 @@ svc_systemd = {
'matrix-dimension': { 'matrix-dimension': {
'needs': { 'needs': {
'action:matrix_dimension_build', 'action:matrix_dimension_build',
'file:{}/config/production.yaml'.format(node.metadata.get('matrix-dimension/install_dir'), 'file:{}/config/production.yaml'.format(node.metadata.get('matrix-dimension/install_dir')),
'postgres_db:matrix-dimension', 'postgres_db:matrix-dimension',
'postgres_role:matrix-dimension', 'postgres_role:matrix-dimension',
}, },

View file

@ -46,7 +46,7 @@ def nginx_config(metadata):
'max_body_size': '50M', 'max_body_size': '50M',
'locations': { 'locations': {
'/': { '/': {
'target': 'http://127.0.0.1:8184', 'target': 'http://127.0.0.1:20030',
}, },
}, },
}, },