From bc7cba745cd10c4a23ad89d49e0c0e66d05086b9 Mon Sep 17 00:00:00 2001
From: alex <alex@pdp7.net>
Date: Wed, 1 Feb 2023 21:16:20 +0100
Subject: Initial add

---
 .../puppet/modules/automatic_updates/manifests/init.pp   |  2 +-
 personal_infra/puppet/modules/nagios_core                |  2 +-
 personal_infra/puppet/site/00-common.pp                  | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'personal_infra/puppet')

diff --git a/personal_infra/puppet/modules/automatic_updates/manifests/init.pp b/personal_infra/puppet/modules/automatic_updates/manifests/init.pp
index eed91aa0..8585b0ae 100644
--- a/personal_infra/puppet/modules/automatic_updates/manifests/init.pp
+++ b/personal_infra/puppet/modules/automatic_updates/manifests/init.pp
@@ -15,7 +15,7 @@ class automatic_updates {
         enable => true,
       }
     }
-    elsif ($facts['os']['release']['major'] == '8') {
+    elsif ($facts['os']['release']['major'] == '8' or $facts['os']['release']['major'] == '9') {
       package {'dnf-automatic':}
       ->
       service {'dnf-automatic-install.timer':
diff --git a/personal_infra/puppet/modules/nagios_core b/personal_infra/puppet/modules/nagios_core
index 5d0a6c2b..8dbf9f12 160000
--- a/personal_infra/puppet/modules/nagios_core
+++ b/personal_infra/puppet/modules/nagios_core
@@ -1 +1 @@
-Subproject commit 5d0a6c2bbc82ea3dd84b3a09680ec01461ff637c
+Subproject commit 8dbf9f12383bd29973963a52968b2850d98292ff
diff --git a/personal_infra/puppet/site/00-common.pp b/personal_infra/puppet/site/00-common.pp
index f60988dc..3fa0dc15 100644
--- a/personal_infra/puppet/site/00-common.pp
+++ b/personal_infra/puppet/site/00-common.pp
@@ -5,3 +5,19 @@ include root_mail
 if $facts['os']['family'] == "Debian" {
   class {'debian':}
 }
+
+$nagios_host = $facts['networking']['fqdn']
+
+nagios_host {$nagios_host:
+  use => 'generic-host',
+  address => $facts['networking']['fqdn'],
+  max_check_attempts => 5,
+  contact_groups => "admins",
+}
+
+nagios_service {"${nagios_host}-ssh":
+  use => 'generic-service',
+  host_name => $facts['networking']['fqdn'],
+  service_description => "ssh",
+  check_command => "check_ssh",
+}
-- 
cgit v1.2.3