miniserver: diverse updates

bundles/icinga2/metadata.py

@@ -17,6 +17,7 @@ defaults = {
             'icinga2': {},
             'icinga2-ido-pgsql': {},
             'icingaweb2': {},
+            'icingaweb2-module-monitoring': {},
             'python3-easysnmp': {},
             'python3-flask': {},
             'snmp': {},

bundles/infobeamer-monitor/files/monitor.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 from json import dumps
 from time import sleep
-from zoneinfo import ZoneInfo
 
 import paho.mqtt.client as mqtt
 from requests import RequestException, get
@@ -62,6 +61,8 @@ def mqtt_dump_state(device):
         out.append("Location: {}".format(device["location"]))
     out.append("Setup: {} ({})".format(device["setup"]["name"], device["setup"]["id"]))
     out.append("Resolution: {}".format(device["run"].get("resolution", "unknown")))
+    if not device["is_synced"]:
+        out.append("syncing ...")
 
     mqtt_out(
         " - ".join(out),
@@ -72,9 +73,6 @@ def mqtt_dump_state(device):
 mqtt_out("Monitor starting up")
 while True:
     try:
-        online_devices = set()
-        available_credits = None
-
         try:
             r = get(
                 "https://info-beamer.com/api/v1/device/list",
@@ -90,6 +88,7 @@ while True:
             )
         else:
             new_state = {}
+            online_devices = set()
             for device in ib_state:
                 did = str(device["id"])
 
@@ -141,15 +140,16 @@ while True:
                         if device["is_online"]:
                             if device["maintenance"]:
                                 mqtt_out(
-                                    "maintenance required: {}".format(
+                                    "maintenance required: {}".format(' '.join(
-                                        " ".join(sorted(device["maintenance"]))
+                                        sorted(device["maintenance"])
-                                    ),
+                                    )),
                                     level="WARN",
                                     device=device,
                                 )
 
                         if (
-                            device["location"] != state[did]["location"]
+                            device["is_synced"] != state[did]["is_synced"]
+                            or device["location"] != state[did]["location"]
                             or device["setup"]["id"] != state[did]["setup"]["id"]
                             or device["run"].get("resolution")
                             != state[did]["run"].get("resolution")
@@ -171,56 +171,13 @@ while True:
 
             state = new_state
 
-        try:
+            if (
-            r = get(
+                datetime.now(timezone.utc).strftime("%H%M") == "1312"
-                "https://info-beamer.com/api/v1/account",
+                and online_devices
-                auth=("", CONFIG["api_key"]),
+                and int(datetime.now(timezone.utc).strftime("%S")) < 30
-            )
+            ):
-            r.raise_for_status()
+                mqtt_out("Online Devices: {}".format(", ".join(sorted(online_devices))))
-            ib_account = r.json()
+        sleep(30)
-        except RequestException as e:
-            LOG.exception("Could not get data from info-beamer")
-            mqtt_out(
-                f"Could not get data from info-beamer: {e!r}",
-                level="WARN",
-            )
-        else:
-            available_credits = ib_account["balance"]
-            if available_credits < 50:
-                mqtt_out(
-                    f"balance has dropped below 50 credits! (available: {available_credits})",
-                    level="ERROR",
-                )
-            elif available_credits < 100:
-                mqtt_out(
-                    f"balance has dropped below 100 credits! (available: {available_credits})",
-                    level="WARN",
-                )
-
-            for quota_name, quota_config in sorted(ib_account["quotas"].items()):
-                value = quota_config["count"]["value"]
-                limit = quota_config["count"]["limit"]
-                if value > limit * 0.9:
-                    mqtt_out(
-                        f"quota {quota_name} is over 90% (limit {limit}, value {value})",
-                        level="ERROR",
-                    )
-                elif value > limit * 0.8:
-                    mqtt_out(
-                        f"quota {quota_name} is over 80% (limit {limit}, value {value})",
-                        level="WARN",
-                    )
-
-        if datetime.now(ZoneInfo("Europe/Berlin")).strftime("%H%M") == "0900":
-            if available_credits is not None:
-                mqtt_out(f"Available Credits: {available_credits}")
-
-            if online_devices:
-                mqtt_out(
-                    "Online Devices: {}".format(", ".join(sorted(online_devices)))
-                )
-
-        sleep(60)
     except KeyboardInterrupt:
         break
 

bundles/postfix/files/main.cf

@@ -25,6 +25,7 @@ inet_interfaces = 127.0.0.1
 % endif
 
 <%text>
+smtp_use_tls = yes
 smtp_tls_loglevel = 1
 smtp_tls_note_starttls_offer = yes
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache

bundles/powerdns/items.py

@@ -3,8 +3,6 @@ from os import listdir
 from os.path import isfile, join
 from subprocess import check_output
 
-from bundlewrap.utils.ui import io
-
 zone_path = join(repo.path, 'data', 'powerdns', 'files', 'bind-zones')
 
 nameservers = set()
@@ -81,10 +79,9 @@ if node.metadata.get('powerdns/features/bind', False):
             continue
 
         try:
-            output = check_output(['git', 'log', '-1', '--pretty=%ci']).decode('utf-8').strip()
+            output = check_output(['git', 'log', '-1', '--pretty=%ci', join(zone_path, zone)]).decode('utf-8').strip()
             serial = datetime.strptime(output, '%Y-%m-%d %H:%M:%S %z').strftime('%y%m%d%H%M')
-        except Exception as e:
+        except:
-            io.stderr(f"Error while parsing commit time for {zone} serial: {e!r}")
             serial = datetime.now().strftime('%y%m%d0000')
 
         primary_zones.add(zone)

bundles/pppd/files/dyndns

@@ -7,6 +7,7 @@ from subprocess import check_output
 
 from requests import get
 
+
 UPDATE_URL = '${url}'
 USERNAME = '${username}'
 PASSWORD = '${password}'

bundles/pppd/files/dyndns_periodic

@@ -5,6 +5,7 @@ from ipaddress import ip_address
 from json import loads
 from subprocess import check_output, run
 
+
 DOMAIN = '${domain}'
 
 # <%text>

bundles/pretalx/items.py

@@ -1,5 +1,5 @@
 assert node.has_bundle('redis'), f'{node.name}: pretalx needs redis'
-assert node.has_bundle('nodejs'), f'{node.name}: pretalx needs nodejs for rebuild step'
+assert node.has_bundle('nodejs'), f'{node.name}: pretalx needs nodejs for rebuild and regenerate_css step'
 
 actions = {
     'pretalx_create_virtualenv': {
@@ -53,6 +53,17 @@ actions = {
         },
         'triggered': True,
     },
+    'pretalx_regenerate-css': {
+        'command': 'sudo -u pretalx PRETALX_CONFIG_FILE=/opt/pretalx/pretalx.cfg /opt/pretalx/venv/bin/python -m pretalx regenerate_css',
+        'needs': {
+            'action:pretalx_migrate',
+            'directory:/opt/pretalx/data',
+            'directory:/opt/pretalx/static',
+            'file:/opt/pretalx/pretalx.cfg',
+            'bundle:nodejs',
+        },
+        'triggered': True,
+    },
 }
 
 users = {
@@ -79,6 +90,7 @@ git_deploy = {
             'action:pretalx_install',
             'action:pretalx_migrate',
             'action:pretalx_rebuild',
+            'action:pretalx_regenerate-css',
             'svc_systemd:pretalx-web:restart',
             'svc_systemd:pretalx-worker:restart',
         },
@@ -109,6 +121,7 @@ svc_systemd = {
             'action:pretalx_install',
             'action:pretalx_migrate',
             'action:pretalx_rebuild',
+            'action:pretalx_regenerate-css',
             'file:/etc/systemd/system/pretalx-web.service',
             'file:/opt/pretalx/pretalx.cfg',
         },
@@ -116,8 +129,7 @@ svc_systemd = {
     'pretalx-worker': {
         'needs': {
             'action:pretalx_install',
-            'action:pretalx_migrate',,
+            'action:pretalx_migrate',
-            'action:pretalx_rebuild',
             'file:/etc/systemd/system/pretalx-worker.service',
             'file:/opt/pretalx/pretalx.cfg',
         },
@@ -192,6 +204,7 @@ for plugin_name, plugin_config in node.metadata.get('pretalx/plugins', {}).items
         'triggers': {
             'action:pretalx_migrate',
             'action:pretalx_rebuild',
+            'action:pretalx_regenerate-css',
             'svc_systemd:pretalx-web:restart',
             'svc_systemd:pretalx-worker:restart',
         },

bundles/routeros/metadata.py

@@ -2,6 +2,7 @@ import re
 from json import load
 from os.path import join
 
+
 with open(join(repo.path, 'configs', 'netbox', f'{node.name}.json')) as f:
     netbox = load(f)
 

data/apt/files/gpg-keys/icinga2.asc

@@ -1,29 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+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
-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
+0petiYsMPYT+MOepCJFGNzwQwJhZrdLUxxMSWay4Xj0ArgpD9vbvU+gj8Tb02l+x
-DeZMF8C+rdzNKXZzn7+nEp9xRy34QUZRfx6pEnugMd0VK0d/ZKgMbcq2IvcRQwap
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+d7rPEeGIzBjI+yhEu8p92W6KWzL0xduWfYg9I7a2GTk8CaLX2OCLuwnKd7RVDyyZ
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+S1i56sH7mQSMaRZP/iiOroAJemPNxv1IQkykxw2woWMmTLKLMCD/i+4DxejE50tK
-+luNb19hUHKyyDDHMe/YM7H9P5vtX9BGz6O9kNpo1LAnigkSQSFBZlK3Po3Yk9eg
+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
-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
+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
-ifY/dQmUP37n5XgMADRc
+5G3/2UD1PMueIwOtAKDVVDXEq5LJPVg4iafNu0SRMwgP0Q==
-=O0zm
+=icbY
 -----END PGP PUBLIC KEY BLOCK-----

libs/demagify.py

@@ -1,6 +1,5 @@
 import bwpass
 
-
 def demagify(something, vault):
     if isinstance(something, str):
         if something.startswith('!bwpass:'):

libs/ssh.py

@@ -4,9 +4,9 @@ from hashlib import sha3_224
 
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 from cryptography.hazmat.primitives.serialization import (Encoding,
-                                                            NoEncryption,
+                                                        NoEncryption,
-                                                            PrivateFormat,
+                                                        PrivateFormat,
-                                                            PublicFormat)
+                                                        PublicFormat)
 
 from bundlewrap.utils import Fault
 

nodes/attributes.py

@@ -1,7 +1,6 @@
-from bundlewrap.utils.scm import get_rev
-from bundlewrap.utils.text import bold, red
 from bundlewrap.utils.ui import io
-
+from bundlewrap.utils.scm import get_rev
+from bundlewrap.utils.text import red, bold
 
 @node_attribute
 def needs_apply(node):

nodes/carlene.toml

@@ -40,7 +40,7 @@ imap_pass = "!bwpass_attr:t-online.de/franzi.kunsmann@t-online.de:imap"
 
 [metadata.element-web]
 url = "chat.franzi.business"
-version = "v1.11.85"
+version = "v1.11.82"
 [metadata.element-web.config]
 default_server_config.'m.homeserver'.base_url = "https://matrix.franzi.business"
 default_server_config.'m.homeserver'.server_name = "franzi.business"
@@ -49,8 +49,8 @@ defaultCountryCode = "DE"
 jitsi.preferredDomain = "meet.ffmuc.net"
 
 [metadata.forgejo]
-version = "9.0.2"
+version = "9.0.1"
-sha1 = "5aecc64f93e8ef05c6d6f83d4b647bdb2c831d9f"
+sha1 = "060d9f00aaf595875eaf1897cbb24e760ef54d64"
 domain = "git.franzi.business"
 enable_git_hooks = true
 install_ssh_key = true
@@ -114,8 +114,8 @@ provisioning.shared_secret = "!decrypt:encrypt$gAAAAABfVKflEMAi07C_QGP8cy97hF-4g
 "'@kunsi:franzi.business'" = "admin"
 
 [metadata.mautrix-whatsapp]
-version = "v0.11.1"
+version = "v0.11.0"
-sha1 = "ada2dc6acfd5cb15fae341266b383d3f6e8b42bd"
+sha1 = "997c794eb246e6cc67ac050c106d54f88531f213"
 permissions."'@kunsi:franzi.business'" = "admin"
 [metadata.mautrix-whatsapp.homeserver]
 domain = "franzi.business"
@@ -126,7 +126,7 @@ domain = "rss.franzi.business"
 
 [metadata.netbox]
 domain = "netbox.franzi.business"
-version = "v4.1.6"
+version = "v4.1.4"
 admins.kunsi = "hostmaster@kunbox.net"
 
 [metadata.nextcloud]

nodes/home/nas.py

@@ -181,10 +181,6 @@ nodes['home.nas'] = {
                     'path': '/storage/nas/Musik',
                     'force_group': 'nas',
                 },
-                'music_videos': {
-                    'path': '/storage/nas/Musikvideos',
-                    'force_group': 'nas',
-                },
             },
             'restrict-to': {
                 '172.19.138.0/24',

nodes/home/paperless.py

@@ -48,7 +48,7 @@ nodes['home.paperless'] = {
         },
         'paperless': {
             'domain': 'paperless.home.kunbox.net',
-            'version': 'v2.13.5',
+            'version': 'v2.13.0',
             'timezone': 'Europe/Berlin',
         },
         'postgresql': {

nodes/sophie/backupserver.py

@@ -37,6 +37,7 @@ nodes['htz-hel.backup-sophie'] = {
         },
         'backup-server': {
             'zfs-base': 'tank/backups',
+            'my_hostname': 'backup.sophies-kitchen.eu',
         },
         'nftables': {
             'input': {

nodes/sophie/miniserver.py

@@ -62,7 +62,7 @@ nodes['htz-cloud.miniserver'] = {
         },
         'element-web': {
             'url': 'chat.sophies-kitchen.eu',
-            'version': 'v1.11.76',
+            'version': 'v1.11.83',
             'config': {
                 'default_server_config': {
                     'm.homeserver': {
@@ -81,7 +81,7 @@ nodes['htz-cloud.miniserver'] = {
             },
         },
         'hedgedoc': {
-            'version': '1.9.9',
+            'version': '1.10.0',
             'config': {
                 'production': {
                     'allowAnonymousEdits': True,

nodes/voc/infobeamer-cms.py

@@ -25,8 +25,8 @@ nodes['voc.infobeamer-cms'] = {
         },
         'infobeamer-cms': {
             'domain': 'infobeamer.c3voc.de',
-            'event_start_date': '2024-12-26',
+            'event_start_date': '2024-10-03',
-            'event_duration_days': 5,
+            'event_duration_days': 4,
             'config': {
                 'ADMIN_USERS': [
                     'hexchen',
@@ -39,7 +39,7 @@ nodes['voc.infobeamer-cms'] = {
                 'GITHUB_CLIENT_ID': vault.decrypt('encrypt$gAAAAABiNwHfIu9PYFfJrF7qirn_9vdvvUlEhJnadoNSS5XlCDbI_aMyj21_ZYQxaCkc6_eVX6Cj1jEHZ7Vs6wM-XyQdW0nUOahtqG4uvnYCiM3GFKHW_wQ='),
                 'GITHUB_CLIENT_SECRET': vault.decrypt('encrypt$gAAAAABiNwHtdZC2XQ8IjosL7vsmrxZMwDIM6AD5dUlLo996tJs4qV7KJETHgYYZil2aMzClwhcE6JmxdhARRp7IJQ4rQQibelTNmyYSzj_V4puVpvma7SU0UZkTIG95SdPpoHY--Zba'),
                 'HOSTED_API_KEY': vault.decrypt('encrypt$gAAAAABhxJPH2sIGMAibU2Us1HoCVlNfF0SQQnVl0eiod48Zu8webL_-xk3wDw3yXw1Hkglj-2usl-D3Yd095yTSq0vZMCv2fh-JWwSPdJewQ45x9Ai4vXVD4CNz5vuJBESKS9xQWXTc'),
-                'INTERRUPT_KEY': vault.human_password_for('infobeamer-cms interrupt key 38c3', words=1),
+                'INTERRUPT_KEY': vault.human_password_for('infobeamer-cms interrupt key'),
                 'SETUP_IDS': [
                     253559,
                 ],
@@ -64,7 +64,7 @@ nodes['voc.infobeamer-cms'] = {
                 'FAQ': {
                     'SOURCE': 'https://github.com/voc/infobeamer-cms',
                     'CONTACT': '''
-    Please use the <a href="https://chat.hackint.org/?join=infobeamer">IRC
+    Please use the <a href="https://webirc.hackint.org/#ircs://irc.hackint.org/#infobeamer">IRC
     Channel #infobeamer on irc.hackint.org</a> (also
     <a href="https://www.hackint.org/transport/matrix">bridged to matrix</a>)
     or #info-beamer on the cccv rocketchat instance.

nodes/voc/pretalx.py

@@ -49,15 +49,14 @@ nodes['voc.pretalx'] = {
             },
         },
         'pretalx': {
-            # 2023.3.1 with some bugfixes
+            'version': 'v2024.2.1',
-            'version': '05e377398cecdd45d3ca6013040c5857bbe225d6',
             'domain': 'pretalx.c3voc.de',
             'mail_from': 'pretalx@c3voc.de',
             'administrators-from-group-id': 1,
             'plugins': {
                 'broadcast_tools': {
                     'repo': 'https://github.com/Kunsi/pretalx-plugin-broadcast-tools.git',
-                    'rev': '2.4.0',
+                    'rev': 'main',
                 },
                 'downstream': {
                     'repo': 'https://github.com/pretalx/pretalx-downstream.git',
@@ -82,6 +81,6 @@ nodes['voc.pretalx'] = {
         },
     },
     'os': 'debian',
-    'os_version': (12,),
+    'os_version': (11,),
     'pip_command': 'pip3',
 }