From d1e28c3f0cb5ece0605d3762852061cb89983c68 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 8 Jun 2024 18:46:51 +0200 Subject: [PATCH] sophie gets her own group --- groups/locations.py | 11 ++++++ nodes/home.drucker-sophie.toml | 6 ---- nodes/home.kodi-wohnzimmer.toml | 35 ------------------- nodes/home.wled-blobkette.toml | 9 ----- nodes/home.wled-wohnzimmer.toml | 9 ----- .../backupserver.py} | 4 +-- nodes/{htz-cloud => sophie}/miniserver.py | 5 +-- .../paperless.py} | 2 +- nodes/{home => sophie}/rechenmonster.py | 2 +- 9 files changed, 15 insertions(+), 68 deletions(-) delete mode 100644 nodes/home.drucker-sophie.toml delete mode 100644 nodes/home.kodi-wohnzimmer.toml delete mode 100644 nodes/home.wled-blobkette.toml delete mode 100644 nodes/home.wled-wohnzimmer.toml rename nodes/{htz-hel/backup-sophie.py => sophie/backupserver.py} (95%) rename nodes/{htz-cloud => sophie}/miniserver.py (98%) rename nodes/{home/paperless-sophie.py => sophie/paperless.py} (98%) rename nodes/{home => sophie}/rechenmonster.py (98%) diff --git a/groups/locations.py b/groups/locations.py index a3738a6..3d40c99 100644 --- a/groups/locations.py +++ b/groups/locations.py @@ -60,6 +60,17 @@ groups['home'] = { }, } +groups['sophie'] = { + 'member_patterns': { + r"sophie\..*", + }, + 'metadata': { + 'icinga_options': { + 'exclude_from_monitoring': True, + }, + }, +} + groups['voc'] = { 'member_patterns': { r"voc\..*", diff --git a/nodes/home.drucker-sophie.toml b/nodes/home.drucker-sophie.toml deleted file mode 100644 index 02c7141..0000000 --- a/nodes/home.drucker-sophie.toml +++ /dev/null @@ -1,6 +0,0 @@ -dummy = true - -[metadata.interfaces.default] -ips = ["172.19.138.61"] -dhcp = true -mac = "00:14:38:9E:29:E3" diff --git a/nodes/home.kodi-wohnzimmer.toml b/nodes/home.kodi-wohnzimmer.toml deleted file mode 100644 index bdd1977..0000000 --- a/nodes/home.kodi-wohnzimmer.toml +++ /dev/null @@ -1,35 +0,0 @@ -hostname = "172.19.138.24" -bundles = ["kodi", "lm-sensors", "nfs-client", "smartd"] -groups = ["debian-bullseye"] - -# is powered off -dummy = true - -[metadata.apt.packages.intel-media-va-driver-non-free] - -[metadata.apt.unattended-upgrades] -day = 6 -hour = 2 -# needs powered on display to detect HDMI audio correctly -reboot_enabled = false - -[metadata.icinga_options] -# is powered off -exclude_from_monitoring = true - -[metadata.interfaces.eno1] -ips = ["172.19.138.24/24"] -gateway4 = "172.19.138.1" -ipv6_accept_ra = true - -[metadata.nfs-client.mounts.nas-storage] -mountpoint = "/mnt/nas" -serverpath = "172.19.138.20:/storage/nas" -mount_options = ["retry=0", "ro"] - -[metadata.smartd] -disks = ["/dev/nvme0"] - -[metadata.vm] -cpu = 2 -ram = 4 diff --git a/nodes/home.wled-blobkette.toml b/nodes/home.wled-blobkette.toml deleted file mode 100644 index cc3b3b1..0000000 --- a/nodes/home.wled-blobkette.toml +++ /dev/null @@ -1,9 +0,0 @@ -dummy = true - -[metadata.interfaces.default] -ips = ["172.19.138.73"] -dhcp = true -mac = "7c:87:ce:b6:54:cd" - -[metadata.icinga_options] -exclude_from_monitoring = true diff --git a/nodes/home.wled-wohnzimmer.toml b/nodes/home.wled-wohnzimmer.toml deleted file mode 100644 index c032230..0000000 --- a/nodes/home.wled-wohnzimmer.toml +++ /dev/null @@ -1,9 +0,0 @@ -dummy = true - -[metadata.interfaces.default] -ips = ["172.19.138.70"] -dhcp = true -mac = "3c:61:05:d0:f2:b9" - -[metadata.icinga_options] -exclude_from_monitoring = true diff --git a/nodes/htz-hel/backup-sophie.py b/nodes/sophie/backupserver.py similarity index 95% rename from nodes/htz-hel/backup-sophie.py rename to nodes/sophie/backupserver.py index c9de769..41a21c0 100644 --- a/nodes/htz-hel/backup-sophie.py +++ b/nodes/sophie/backupserver.py @@ -6,6 +6,7 @@ nodes['htz-hel.backup-sophie'] = { }, 'groups': { 'debian-bullseye', + 'sophie', }, 'metadata': { 'apt': { @@ -30,9 +31,6 @@ nodes['htz-hel.backup-sophie'] = { 'gateway6': '2a01:4f9:6b:2d99::2', }, }, - 'icinga_options': { - 'pretty_name': 'backup.sophies-kitchen.eu', - }, 'vm': { 'cpu': 4, 'ram': 8, diff --git a/nodes/htz-cloud/miniserver.py b/nodes/sophie/miniserver.py similarity index 98% rename from nodes/htz-cloud/miniserver.py rename to nodes/sophie/miniserver.py index 90354b3..346a8ee 100644 --- a/nodes/htz-cloud/miniserver.py +++ b/nodes/sophie/miniserver.py @@ -15,6 +15,7 @@ nodes['htz-cloud.miniserver'] = { }, 'groups': { 'debian-bookworm', + 'sophie', 'webserver', }, 'metadata': { @@ -89,10 +90,6 @@ nodes['htz-cloud.miniserver'] = { }, }, }, - 'icinga_options': { - 'pretty_name': 'sophies-kitchen.eu', - 'vars.notification.sms': False, - }, 'letsencrypt': { 'concat_and_deploy': { 'sophie-weechat': { diff --git a/nodes/home/paperless-sophie.py b/nodes/sophie/paperless.py similarity index 98% rename from nodes/home/paperless-sophie.py rename to nodes/sophie/paperless.py index c17ca8d..9463f06 100644 --- a/nodes/home/paperless-sophie.py +++ b/nodes/sophie/paperless.py @@ -1,4 +1,4 @@ -nodes['home.paperless-sophie'] = { +nodes['sophie.paperless'] = { 'hostname': '172.19.138.30', 'bundles': { 'nfs-client', diff --git a/nodes/home/rechenmonster.py b/nodes/sophie/rechenmonster.py similarity index 98% rename from nodes/home/rechenmonster.py rename to nodes/sophie/rechenmonster.py index f4e76ad..699935d 100644 --- a/nodes/home/rechenmonster.py +++ b/nodes/sophie/rechenmonster.py @@ -1,4 +1,4 @@ -nodes['home.rechenmonster'] = { +nodes['sophie.rechenmonster'] = { 'hostname': '172.19.138.98', 'bundles': { 'basic',