bw/matrix-dimension enable process monitoring

PORT_MAP.md

@@ -26,11 +26,11 @@ Rule of thumb: keep ports below 10000 free for stuff that reserves ports.
 | 6667        |                      | bitlbee |
 | 8010        |                      | matrix-media-repo |
 | 8086        | influxdb2            | influx |
-| 8184        |                      | matrix-dimension |
 | 11332-11334 | rspamd               | rspamd |
 | 20000       | mx-puppet-discord    | Bridge |
 | 20010       | mautrix-telegram     | Bridge |
 | 20020       | mautrix-whatsapp     | Bridge |
+| 20030       | matrix-dimension     | Matrix Integrations Manager|
 | 20080       | matrix-synapse       | client, federation |
 | 20081       | matrix-synapse       | prometheus metrics |
 | 20090       | matrix-media-repo    | media_repo |

bundles/matrix-dimension/files/matrix-dimension.service

@@ -3,8 +3,8 @@ Description=Matrix Dimension
 After=network.target
 
 [Service]
-User=matrix-support
+User=matrix-dimension
-Group=matrix-support
+Group=matrix-dimension
 Environment="NODE_ENV=production"
 ExecStart=/usr/bin/node ${config['install_dir']}/build/app/index.js
 WorkingDirectory=${config['install_dir']}

bundles/matrix-dimension/files/production.yaml

@@ -1,18 +1,18 @@
 # The web settings for the service (API and UI).
 # It is best to have this run on localhost and use a reverse proxy to access Dimension.
 web:
-  port: 8184
+  port: 20030
   address: '127.0.0.1'
 
 # Homeserver configuration
 homeserver:
   # The domain name of the homeserver. This is used in many places, such as with go-neb
   # setups, to identify the homeserver.
-  name: "${config['homserver']['name']}"
+  name: "${config['homeserver']['name']}"
 
   # The URL that Dimension, go-neb, and other services provisioned by Dimension should
   # use to access the homeserver with.
-  clientServerUrl: "${config['homserver']['clientServeUrl']}"
+  clientServerUrl: "${config['homeserver']['clientServerUrl']}"
 
   # The URL that Dimension should use when trying to communicate with federated APIs on
   # the homeserver. If not supplied or left empty Dimension will try to resolve the address
@@ -27,7 +27,7 @@ homeserver:
   # for tracking custom sticker pack updates. This should be a user configured on the homeserver
   # and be dedicated to Dimension (create a user named "dimension" on your homeserver). For
   # information on how to acquire an access token, visit https://t2bot.io/docs/access_tokens
-  accessToken: "${config['homserver']['accessToken']}"
+  accessToken: "${config['homeserver']['accessToken']}"
 
 # These users can modify the integrations this Dimension supports.
 # To access the admin interface, open Dimension in Riot and click the settings icon.

bundles/matrix-dimension/items.py

@@ -3,8 +3,8 @@ repo.libs.tools.require_bundle(node, 'nodejs')
 
 directories = {
     node.metadata['matrix-dimension']['install_dir']: {
-        'owner': 'matrix-support',
+        'owner': 'matrix-dimension',
-        'group': 'matrix-support',
+        'group': 'matrix-dimension',
     },
 }
 
@@ -24,8 +24,8 @@ git_deploy = {
 
 files = {
     '{}/config/production.yaml'.format(node.metadata['matrix-dimension']['install_dir']): {
-        'owner': 'matrix-support',
+        'owner': 'matrix-dimension',
-        'group': 'matrix-support',
+        'group': 'matrix-dimension',
         'content_type': 'mako',
         'context': {
             'config': node.metadata.get('matrix-dimension', {}),
@@ -49,7 +49,7 @@ files = {
 
 actions = {
     'matrix_dimension_build': {
-        'command': 'cd ' + node.metadata['matrix-dimension']['install_dir'] + ' && sudo -u matrix-support npm install && sudo -u matrix-support npm run build',
+        'command': 'cd ' + node.metadata['matrix-dimension']['install_dir'] + ' && sudo -u matrix-dimension npm install && sudo -u matrix-dimension npm run build',
         'needs': {
             'pkg_apt:nodejs',
         },

bundles/matrix-dimension/metadata.py

@@ -27,7 +27,7 @@ defaults = {
         },
     },
     'users': {
-        'matrix-support': {
+        'matrix-dimension': {
             'home': '/var/opt/matrix-dimension',
         },
     },
@@ -68,9 +68,9 @@ def icinga_check_for_new_release(metadata):
                         'vars.notification.mail': True,
                         'check_interval': '60m',
                     },
-                    #'MATRIX-DIMENSION PROCESS': {
+                    'MATRIX-DIMENSION PROCESS': {
-                    #    'command_on_monitored_host': '/usr/lib/nagios/plugins/check_procs -a mautrix-telegram -c 1:',
+                        'command_on_monitored_host': '/usr/lib/nagios/plugins/check_procs -a matrix-dimension -c 1:',
-                    #},
+                    },
                 },
             },
         },

nodes/htz-cloud/miniserver.py

@@ -107,7 +107,7 @@ nodes['htz-cloud.miniserver'] = {
         'matrix-dimension': {
             'url': 'dimension.sophies-kitchen.eu',
             'version': 'master', # doesn't have releases yet
-            'homserver': {
+            'homeserver': {
                 'name': 'sophies-kitchen.eu',
                 'clientServeUrl': 'https://matrix.sophies-kitchen.eu',
                 'accessToken': vault.decrypt('encrypt$gAAAAABg4btB0KGk068ahGZzR0w_Lm1bj1wUbB2WfNNs2bp3PwM4Ftp6MjQnrF-CejZfrF0NjPJw9Z4MrgileHP0sVw04mvgKSHfTf8gv4kTB6WuCIxHeMWHUDx00LTWL73fSlhCK0o1'),