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 +16 -16
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3a26c766f9 - Show all commits

2
bundles/matrix-dimension/files/matrix-dimension.service
View file

@ -6,7 +6,7 @@ After=network.target
User=matrix-support User=matrix-support
sophie marked this conversation as resolved Outdated
kunsi commented 2021-07-04 18:27:20 +00:00
Outdated
Review
Copy link

Please use a user dedicated to this bundle, naming them accordingly

Please use a user dedicated to this bundle, naming them accordingly
sophie commented 2021-07-04 18:59:57 +00:00
Outdated
Review
Copy link

Resolved in b87d3cc975

Resolved in `b87d3cc975`
Group=matrix-support Group=matrix-support
Environment="NODE_ENV=production" Environment="NODE_ENV=production"
ExecStart=/usr/bin/node /opt/matrix/matrix-dimension/build/app/index.js ExecStart=/usr/bin/node ${config['install_dir']}/build/app/index.js
WorkingDirectory=${config['install_dir']} WorkingDirectory=${config['install_dir']}
Restart=on-failure Restart=on-failure

2
bundles/matrix-dimension/files/production.yaml
View file

@ -45,7 +45,7 @@ widgetBlacklist:
database: database:
# Where the database for Dimension is # Where the database for Dimension is
uri: "postgres://${node.metadata['matrix-dimension']['database']['user']}:${node.metadata['matrix-dimension']['database']['password']}@${node.metadata['matrix-dimension']['database'].get('host', 'localhost')}/${node.metadata['matrix-dimension']['database']['database']}" uri: "postgres://${node.metadata['matrix-dimension']['database']['user']}:${node.metadata['matrix-dimension']['database']['password']}@${node.metadata['matrix-dimension']['database'].get('host', 'localhost')}/${node.metadata['matrix-dimension']['database']['database']}"
# Where to store misc information for the utility bot account. # Where to store misc information for the utility bot account.
botData: "${config['data_dir']}/dimension.bot.json" botData: "${config['data_dir']}/dimension.bot.json"

14
bundles/matrix-dimension/items.py
View file

@ -2,8 +2,10 @@ repo.libs.tools.require_bundle(node, 'nodejs')
directories = { directories = {
node.metadata['matrix-dimension']['install_dir']: {}, node.metadata['matrix-dimension']['install_dir']: {
node.metadata['matrix-dimension']['data_dir']: {}, 'owner': 'matrix-support',
'group': 'matrix-support',
},
} }
git_deploy = { git_deploy = {
@ -22,6 +24,8 @@ git_deploy = {
files = { files = {
'{}/config/production.yaml'.format(node.metadata['matrix-dimension']['install_dir']): { '{}/config/production.yaml'.format(node.metadata['matrix-dimension']['install_dir']): {
'owner': 'matrix-support',
'group': 'matrix-support',
'content_type': 'mako', 'content_type': 'mako',
'context': { 'context': {
'config': node.metadata.get('matrix-dimension', {}), 'config': node.metadata.get('matrix-dimension', {}),
@ -44,8 +48,8 @@ files = {
} }
actions = { actions = {
'matrix_dimenson_build': { 'matrix_dimension_build': {
'command': 'cd ' + node.metadata['matrix-dimension']['install_dir'] + ' && npm install && npm run build', 'command': 'cd ' + node.metadata['matrix-dimension']['install_dir'] + ' && sudo -u matrix-support npm install && sudo -u matrix-support npm run build',
'needs': { 'needs': {
'pkg_apt:nodejs', 'pkg_apt:nodejs',
}, },
@ -59,7 +63,7 @@ actions = {
svc_systemd = { 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['matrix-dimension']['install_dir']),
'postgres_db:matrix-dimension', 'postgres_db:matrix-dimension',
'postgres_role:matrix-dimension', 'postgres_role:matrix-dimension',

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

@ -1,7 +1,7 @@
defaults = { defaults = {
'matrix-dimension': { 'matrix-dimension': {
'install_dir': '/opt/matrix-dimension', 'install_dir': '/opt/matrix-dimension',
'data_dir': '/var/opt/dimension', 'data_dir': '/var/opt/matrix-dimension',
kunsi marked this conversation as resolved
kunsi commented 2021-07-04 18:32:32 +00:00
Review
Copy link

Do we really need to backup this?

Do we really need to backup this?
sophie commented 2021-07-04 18:48:31 +00:00
Review
Copy link

npm writes all kinds of install info to this location, I guess so.

npm writes all kinds of install info to this location, I guess so.
kunsi commented 2021-07-04 18:50:22 +00:00
Review
Copy link

If it's only information we can restore using a bw apply, there should be no need to backup this. But if it's more than that, i'm okay with backing this up.

If it's only information we can restore using a `bw apply`, there should be no need to backup this. But if it's more than that, i'm okay with backing this up.
'database': { 'database': {
'user': 'matrix-dimension', 'user': 'matrix-dimension',
'password': repo.vault.password_for('{} postgresql matrix-dimension'.format(node.name)), 'password': repo.vault.password_for('{} postgresql matrix-dimension'.format(node.name)),
@ -20,13 +20,9 @@ defaults = {
}, },
}, },
}, },
'icinga2_api': { 'users': {
'mautrix-telegram': { 'matrix-support': {
'services': { 'home': '/var/opt/matrix-dimension',
'MAUTRIX-TELEGRAM PROCESS': {
'command_on_monitored_host': '/usr/lib/nagios/plugins/check_procs -a mautrix-telegram -c 1:',
},
},
}, },
}, },
} }
@ -39,7 +35,7 @@ def nginx_config(metadata):
'nginx': { 'nginx': {
'vhosts': { 'vhosts': {
metadata.get('matrix-dimension/url'): { metadata.get('matrix-dimension/url'): {
'webroot': '/var/www/{}/webapp/'.format(metadata.get('element-web/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',
'proxy': { 'proxy': {