diff --git a/bin/apt_upgrade_and_restart_all b/bin/apt_upgrade_and_restart_all index 7e977e2..6227c78 100755 --- a/bin/apt_upgrade_and_restart_all +++ b/bin/apt_upgrade_and_restart_all @@ -63,4 +63,7 @@ for node in [ *wireguard_servers, ]: print('rebooting', node.name) - print(node.run('systemctl reboot').stdout.decode()) + try: + print(node.run('systemctl reboot').stdout.decode()) + except Exception as e: + print(e) diff --git a/bundles/java/metadata.py b/bundles/java/metadata.py index 0fe4d09..e399b06 100644 --- a/bundles/java/metadata.py +++ b/bundles/java/metadata.py @@ -6,6 +6,7 @@ defaults = { 'version': { 10: 11, 11: 17, + 12: 17, }[node.os_version[0]], }, } diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py index 5503ba2..8f72b7c 100644 --- a/bundles/telegraf/metadata.py +++ b/bundles/telegraf/metadata.py @@ -5,9 +5,6 @@ defaults = { 'packages': { 'telegraf': {}, }, - 'sources': { - 'deb https://repos.influxdata.com/debian {release} stable', - }, }, 'telegraf': { 'config': { @@ -81,6 +78,28 @@ defaults = { } +@metadata_reactor.provides( + 'apt/sources', +) +def apt(metadata): + release = { + 'buster': 'buster', + 'bullseye': 'bullseye', + 'bookworm': 'bullseye', + }[metadata.get('os_release')] + + return { + 'apt': { + 'packages': { + 'telegraf': {}, + }, + 'sources': { + f"deb https://repos.influxdata.com/debian {release} stable", + }, + }, + } + + @metadata_reactor.provides( 'telegraf/config/outputs/influxdb_v2', ) diff --git a/groups/os/debian-12.py b/groups/os/debian-12.py new file mode 100644 index 0000000..13eb92d --- /dev/null +++ b/groups/os/debian-12.py @@ -0,0 +1,20 @@ +{ + 'supergroups': [ + 'debian', + ], + 'metadata': { + 'apt': { + 'sources': { + 'deb http://security.debian.org/ {release}-security main contrib non-free', + }, + }, + 'php': { + 'version': '8.1', + }, + 'postgresql': { + 'version': '14', + }, + 'os_release': 'bookworm', + }, + 'os_version': (12,), +}