matrix-dimension #44

Merged
sophie merged 16 commits from matrix-dimension into main 2021-07-17 09:58:18 +00:00
Showing only changes of commit 6ceb47a92e - Show all commits

View file

@ -10,20 +10,20 @@ directories = {
git_deploy = { git_deploy = {
node.metadata['matrix-dimension']['install_dir']: { node.metadata['matrix-dimension']['install_dir']: {
'rev': node.metadata.get('matrix-dimension', {}).get('version', 'master'), # doesn't have releases yet 'rev': node.metadata.get('matrix-dimension/version', 'master'), # doesn't have releases yet
'repo': 'https://github.com/turt2live/matrix-dimension.git', 'repo': 'https://github.com/turt2live/matrix-dimension.git',
'triggers': { 'triggers': {
'action:matrix_dimension_build', 'action:matrix_dimension_build',
}, },
'needs': { 'needs': {
'directory:{}'.format(node.metadata['matrix-dimension']['install_dir']), 'directory:{}'.format(node.metadatai.get('matrix-dimension/install_dir'),
'directory:{}'.format(node.metadata['matrix-dimension']['data_dir']), 'directory:{}'.format(node.metadata.get('matrix-dimension/data_dir'),
}, },
}, },
} }
files = { files = {
'{}/config/production.yaml'.format(node.metadata['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',
@ -32,7 +32,7 @@ files = {
}, },
'needs': { 'needs': {
'action:element-web_yarn', 'action:element-web_yarn',
'directory:{}'.format(node.metadata['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',
@ -52,7 +52,7 @@ files = {
actions = { actions = {
'matrix_dimension_build': { 'matrix_dimension_build': {
'command': 'cd ' + node.metadata['matrix-dimension']['install_dir'] + ' && sudo -u matrix-dimension npm install && sudo -u matrix-dimension npm run build', 'command': 'cd ' + node.metadata.get('matrix-dimension/install_dir') + ' && sudo -u matrix-dimension npm install && sudo -u matrix-dimension npm run build',
'needs': { 'needs': {
'pkg_apt:nodejs', 'pkg_apt:nodejs',
}, },
@ -67,7 +67,7 @@ svc_systemd = {
'matrix-dimension': { 'matrix-dimension': {
'needs': { 'needs': {
'action:matrix_dimension_build', 'action:matrix_dimension_build',
'file:{}/config/production.yaml'.format(node.metadata['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',
}, },