rx300,htz-cloud.miniserver: Updates

- update element-web to 1.10.11
- update gitea to 1.16.6
- update mautrix-telegram to 0.11.3
- update mautrix-whatsapp to 0.3.1

bundles/nfs-client/items.py

@@ -10,15 +10,11 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
     unitname = data.get('mountpoint','')[1:].replace('-','\\x2d').replace('/','-')
 
     directories[data['mountpoint']] = {
-        'owner': None,
+        'owner': data.get('owner'),
-        'group': None,
+        'group': data.get('group'),
-        'mode': None,
+        'mode': data.get('mode'),
     }
 
-    for parameter in ['mode', 'owner', 'group']:
-        if parameter in data:
-            directories[data['mountpoint']][parameter] = data[parameter]
-
     if 'suid' not in data['mount_options']:
         data['mount_options'].add('nosuid')
 
@@ -49,6 +45,13 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
             },
         }
     else:
+        files['/etc/systemd/system/{}.automount'.format(unitname)] = {
+            'delete': True,
+            'triggers': {
+                "action:systemd-reload",
+            },
+        }
+
         svc_systemd['{}.mount'.format(unitname)] = {
             'needs': {
                 'file:/etc/systemd/system/{}.mount'.format(unitname),

bundles/voc-tracker-worker/files/crs-runner.service

@@ -9,6 +9,7 @@ ExecStart=/opt/crs-scripts/bin/crs_run ${script}
 WorkingDirectory=/opt/crs-scripts
 Restart=on-failure
 RestartSec=10
+SyslogIdentifier=crs-${worker}
 
 [Install]
 WantedBy=crs-worker.target

bundles/voc-tracker-worker/files/environment

@@ -1,3 +1,6 @@
 export CRS_TRACKER="${url}"
 export CRS_TOKEN="${token}"
 export CRS_SECRET="${secret}"
+% if use_vaapi:
+export CRS_USE_VAAPI="yes"
+% endif

bundles/voc-tracker-worker/items.py

@@ -12,7 +12,10 @@ directories = {
 }
 
 for path in paths:
-    directories[f'/video/{path}'] = {}
+    directories[f'/video/{path}'] = {
+        'owner': 'voc',
+        'group': 'voc',
+    }
 
 git_deploy = {
     '/opt/crs-scripts': {
@@ -41,6 +44,7 @@ for worker, script in {
         'content_type': 'mako',
         'source': 'crs-runner.service',
         'context': {
+            'worker': worker,
             'script': script,
         },
         'needs': {

bundles/voc-tracker-worker/metadata.py

@@ -17,6 +17,9 @@ defaults = {
             'libxml-simple-perl': {},
         },
     },
+    'voc-tracker-worker': {
+        'use_vaapi': False,
+    },
     'users': {
         'voc': {
             'home': '/opt/voc',

nodes/fkusei-locutus.py

@@ -9,6 +9,7 @@ nodes['fkusei-locutus'] = {
         'systemd-boot',
         'telegraf-battery-usage',
         'wireguard',
+        'voc-tracker-worker',
         'zfs',
     },
     'groups': {
@@ -130,6 +131,11 @@ nodes['fkusei-locutus'] = {
                 'delete': True,
             },
         },
+        'voc-tracker-worker': {
+            'url': 'https://tracker.c3voc.de/rpc',
+            'token': vault.decrypt('encrypt$gAAAAABiYqaFl4CqOc8DTQIn49Qq0KgAJSzA19GKPNMbyHIjYg0JkvY0sK43ps8CbJWMRR6hJHVK-nP4vrWLwyoWWqt8N8aASMur4odC2s8pEHQKM0TXg4cRwobQz_lyJgrYa2VYdhcD'),
+            'secret': vault.decrypt('encrypt$gAAAAABiYqaYbY-3IbnRk-S25pqxrOGN7ovgPo3kBYz8ZqKDedPRzskKZefpLHxBbCOZKjg1XNT4cKbIs5cPCLdj7HdY4beAhnXl4EHZZdxU1zVC7sJCmz9XOS_Ac0UOgOlUFMiet14U'),
+        },
         'wireguard': {
             'privatekey': vault.decrypt('smedia$NotViaThisRepository'),
             'peers': {

nodes/htz-cloud/miniserver.py

@@ -60,7 +60,7 @@ nodes['htz-cloud.miniserver'] = {
         },
         'element-web': {
             'url': 'chat.sophies-kitchen.eu',
-            'version': 'v1.10.10',
+            'version': 'v1.10.11',
             'config': {
                 'default_server_config': {
                     'm.homeserver': {
@@ -133,6 +133,7 @@ nodes['htz-cloud.miniserver'] = {
         },
         'matrix-media-repo': {
             'version': 'v1.2.12',
+            'sha1': 'c2dfa521c2eea9a0dcde9f1c7803f52ce6d0352e',
             'homeservers': {
                 'sophies-kitchen.eu': {
                     'domain': 'http://[::1]:20080/',
@@ -153,7 +154,7 @@ nodes['htz-cloud.miniserver'] = {
             },
         },
         'mautrix-telegram': {
-            'version': 'v0.11.2',
+            'version': 'v0.11.3',
             'homeserver': {
                 'domain': 'sophies-kitchen.eu',
                 'url': 'https://matrix.sophies-kitchen.eu',

nodes/kunsi-p14s.py

@@ -188,6 +188,12 @@ nodes['kunsi-p14s'] = {
                         'bundle:vmhost',
                     },
                 },
+                'zroot/system/video': {
+                    'mountpoint': '/video',
+                    'needed_by': {
+                        'bundle:voc-tracker-worker',
+                    },
+                },
                 'zroot/system/root': {
                     'canmount': 'noauto',
                     'mountpoint': '/',
@@ -206,6 +212,7 @@ nodes['kunsi-p14s'] = {
                 'snapshot_never': {
                     'zroot/movies',
                     'zroot/system/journal',
+                    'zroot/system/video',
                 },
             },
         },

nodes/rx300.py

@@ -103,7 +103,7 @@ nodes['rx300'] = {
         },
         'element-web': {
             'url': 'chat.franzi.business',
-            'version': 'v1.10.10',
+            'version': 'v1.10.11',
             'config': {
                 'default_server_config': {
                     'm.homeserver': {
@@ -126,8 +126,8 @@ nodes['rx300'] = {
             },
         },
         'gitea': {
-            'version': '1.16.5',
+            'version': '1.16.6',
-            'sha1': '2ddaf011428753da0d7ef0ef5c7f36c7f21cd3c7',
+            'sha1': '9dcfc4093e35923c25261d3d19e33207f5a0f2bc',
             'domain': 'git.franzi.business',
             'email_domain_blocklist': {
                 'aol.com',
@@ -227,7 +227,7 @@ nodes['rx300'] = {
             },
         },
         'mautrix-telegram': {
-            'version': 'v0.11.2',
+            'version': 'v0.11.3',
             'homeserver': {
                 'domain': 'franzi.business',
                 'url': 'https://matrix.franzi.business',
@@ -250,8 +250,8 @@ nodes['rx300'] = {
             },
         },
         'mautrix-whatsapp': {
-            'version': 'v0.3.0',
+            'version': 'v0.3.1',
-            'sha1': '10d65afccb4e7e477125310088022a137a4f0589',
+            'sha1': '761eb892650fa943e7c4fea6f285ca37ba1e5113',
             'homeserver': {
                 'domain': 'franzi.business',
                 'url': 'https://matrix.franzi.business',