From 57675c08eb8a04d56cf48df48881e3700bb18588 Mon Sep 17 00:00:00 2001 From: CroneKorkN Date: Sat, 9 Aug 2025 14:58:27 +0200 Subject: [PATCH] new ovh.secondary --- bundles/gitea/items.py | 2 +- bundles/sudo/items.py | 1 + bundles/telegraf/metadata.py | 22 ++++++++++++++++++++-- nodes/ovh.secondary.py | 6 +++--- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/bundles/gitea/items.py b/bundles/gitea/items.py index a663f50..b1d5f85 100644 --- a/bundles/gitea/items.py +++ b/bundles/gitea/items.py @@ -49,7 +49,7 @@ files['/etc/gitea/app.ini'] = { ), 'owner': 'git', 'mode': '0600', - 'context': node.metadata['gitea'], + 'context': node.metadata.get('gitea'), 'triggers': { 'svc_systemd:gitea:restart', }, diff --git a/bundles/sudo/items.py b/bundles/sudo/items.py index 0f9acea..7901496 100644 --- a/bundles/sudo/items.py +++ b/bundles/sudo/items.py @@ -1,5 +1,6 @@ directories = { '/etc/sudoers.d': { + 'mode': '0750', 'purge': True, }, } diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py index 18bcb2f..523a72a 100644 --- a/bundles/telegraf/metadata.py +++ b/bundles/telegraf/metadata.py @@ -7,8 +7,6 @@ defaults = { # needed by crystal plugins: 'libgc-dev': {}, 'libevent-dev': {}, - # crystal based (procio, pressure_stall): - 'libpcre3': {}, }, 'sources': { 'influxdata': { @@ -126,3 +124,23 @@ def influxdb(metadata): }, }, } + + +# crystal based (procio, pressure_stall): +@metadata_reactor.provides( + 'apt/packages/libpcre2-8-0', + 'apt/packages/libpcre3', +) +def libpcre(metadata): + if node.os == 'debian' and node.os_version >= (13,): + libpcre_package = 'libpcre2-8-0' + else: + libpcre_package = 'libpcre3' + + return { + 'apt': { + 'packages': { + libpcre_package: {}, + }, + }, + } diff --git a/nodes/ovh.secondary.py b/nodes/ovh.secondary.py index 082a479..680c597 100644 --- a/nodes/ovh.secondary.py +++ b/nodes/ovh.secondary.py @@ -1,5 +1,5 @@ { - 'hostname': '135.125.239.125', + 'hostname': '51.68.189.180', 'groups': [ 'debian-13', 'dnsserver', @@ -13,9 +13,9 @@ 'network': { 'external': { 'interface': 'ens3', - 'ipv4': '135.125.239.125/32', + 'ipv4': '51.68.189.180/32', 'gateway4': '135.125.238.1', - 'ipv6': '2001:41d0:701:1100::3dea/56', + 'ipv6': '2001:41d0:701:1100::751a/128', 'gateway6': '2001:41d0:701:1100::1', }, },