From b839f491d13a16ec391eef93b3405735a529e7e4 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 24 Sep 2026 15:35:45 +0200 Subject: [PATCH] Recommit for updates in build 14 --- ...droid_automatic_3A_3Amain_3A_3Aconfig.html | 10 +- .../confdroid_automatic_3A_3Aparams.html | 96 +++++++++++++++++-- 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/doc/puppet_classes/confdroid_automatic_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_automatic_3A_3Amain_3A_3Aconfig.html index 27bfe2e..a0c2d2e 100644 --- a/doc/puppet_classes/confdroid_automatic_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_automatic_3A_3Amain_3A_3Aconfig.html @@ -105,7 +105,11 @@ 7 8 9 -10 +10 +11 +12 +13 +14
# File 'manifests/main/config.pp', line 6
@@ -114,6 +118,10 @@ class confdroid_automatic::main::config (
 
 ) inherits confdroid_automatic::params {
   include confdroid_automatic::main::service
+
+  if $ac_manage_nagios == true {
+    include confdroid_automatic::monitoring::target
+  }
 }
diff --git a/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html b/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html index 668797f..d6e7496 100644 --- a/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_automatic_3A_3Aparams.html @@ -318,6 +318,78 @@ —

packages to exclude from updates

+
+ + + +
  • + + ac_manage_nagios + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to manage nagios monitoring

    +
    + +
  • + +
  • + + ac_target_service + + + (String) + + + (defaults to: '/etc/nagios/conf.d/automatic_service.cfg') + + + — +
    +

    where to write the nagios service config

    +
    + +
  • + +
  • + + ac_target_contacts + + + (String) + + + (defaults to: 'nagiosadmin') + + + — +
    +

    which nagios contacts to use

    +
    + +
  • + +
  • + + ac_procs_allowed + + + (String) + + + (defaults to: '1:') + + + — +
    +

    how many processes are allowed to run

  • @@ -333,10 +405,6 @@
     
     
    -19
    -20
    -21
    -22
     23
     24
     25
    @@ -371,10 +439,20 @@
     54
     55
     56
    -57
    +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 -
    # File 'manifests/params.pp', line 19
    +        
    # File 'manifests/params.pp', line 23
     
     class confdroid_automatic::params (
     
    @@ -393,6 +471,12 @@ class confdroid_automatic::params (
       String $ac_email_to                 = 'root@example.net',
       String $ac_email_host               = 'localhost',
     
    +  # monitoring
    +  Boolean $ac_manage_nagios           = false,
    +  String $ac_target_service           = '/etc/nagios/conf.d/automatic_service.cfg',
    +  String $ac_target_contacts          = 'nagiosadmin',
    +  String $ac_procs_allowed            = '1:',
    +
     ) {
     # Facts
       $fqdn                     = $facts['networking']['fqdn']