From b4b3de53a39ef006355c372187f8c75b4deda894 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 25 Jul 2017 16:48:58 +0200 Subject: [PATCH 01/11] recommit for updates in build 84 --- CHANGELOG.md | 80 +++ REPOSTRUCTURE.md | 5 +- doc/_index.html | 7 +- doc/file.README.html | 21 +- doc/index.html | 21 +- doc/puppet_class_list.html | 17 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 604 ++++++++++++++++++ doc/puppet_classes/cd_nagios_3A_3Aparams.html | 4 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 22 files changed, 745 insertions(+), 42 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 08f8a3a..68b6dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,86 @@ Changelog of Git Changelog.

No issue

+4ae4a056901361a Jenkins Server 2017-07-25 14:34:30 +

+

recommit for updates in build 83

+ +

+f2a243b7c28f935 Arne Teuke 2017-07-25 14:34:14 +

+

checked and documented all parameters, fixed template syntaxes

+ +

+66d7dbd91cffae4 Arne Teuke 2017-07-25 14:28:08 +

+

template syntax

+ +

+d57274747a8e494 Arne Teuke 2017-07-25 14:25:50 +

+

template syntax

+ +

+e8dc9c43f2a4929 Arne Teuke 2017-07-25 14:24:34 +

+

template syntax

+ +

+b59eff871f3c507 Arne Teuke 2017-07-25 14:23:29 +

+

template syntax

+ +

+616d0c3e9fb58b2 Arne Teuke 2017-07-25 14:21:38 +

+

template syntax

+ +

+a902f3441b0341f Arne Teuke 2017-07-25 14:15:07 +

+

template syntax

+ +

+c00ece4cb6c8f90 Arne Teuke 2017-07-25 14:13:38 +

+

template syntax

+ +

+f853a7b923a54d3 Arne Teuke 2017-07-25 14:11:16 +

+

template syntax

+ +

+1c83a1e829005c2 Arne Teuke 2017-07-25 14:09:51 +

+

template syntax

+ +

+bd7822710c44a07 Arne Teuke 2017-07-25 14:06:56 +

+

template syntax

+ +

+3ef1c7d9c75f229 Arne Teuke 2017-07-25 14:05:13 +

+

template syntax

+ +

+9571dc875b0362e Arne Teuke 2017-07-25 14:01:26 +

+

template syntax

+ +

+12e671b3419dd2a Arne Teuke 2017-07-25 13:58:36 +

+

template syntax

+ +

+86d4dd1db69fd1a Arne Teuke 2017-07-25 13:50:33 +

+

finished params for nagios.cfg

+ +

449f2f7825b0d88 Jenkins Server 2017-07-24 15:25:38

recommit for updates in build 68

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index acf8c42..9261220 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -44,6 +44,9 @@ | | |-- dirs.pp | | |-- install.pp | | `-- user.pp +| |-- nagios +| | `-- objects +| | `-- commands.pp | |-- selinux | | `-- config.pp | |-- server @@ -79,4 +82,4 @@ |-- README.md `-- REPOSTRUCTURE.md -18 directories, 61 files +20 directories, 62 files diff --git a/doc/_index.html b/doc/_index.html index 448e55a..64f9fc8 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -108,6 +108,11 @@ +
  • + cd_nagios::nagios::objects::commands + +
    • +
  • cd_nagios::params @@ -186,7 +191,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 8fe3fb3..48d09e9 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -141,17 +141,18 @@ directories (filesystem permissions, selinux ) * manage cgi.cfg through parameters * manage nagios.cfg through parameters -* manage nagios users +* manage Nagios users through external Puppet rules via define -* configure NRPE on clients +* manage Nagios commands through +Puppet exports +* configure NRPE on clients (optional) +* configure firewall (optional) -* configure firewall (optional) -* configure selinux policies -(optional) -* configure forwarding http to https including accesing the -/nagios url directly (optional) -* manage TLS certificates through certbot -(optional)

    +* configure selinux policies (optional) +* configure forwarding +http to https including accesing the /nagios url directly (optional) +* +manage TLS certificates through certbot (optional)

    Service * manage Nagios service on server @@ -337,7 +338,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 3877d07..8d6b073 100644 --- a/doc/index.html +++ b/doc/index.html @@ -141,17 +141,18 @@ directories (filesystem permissions, selinux ) * manage cgi.cfg through parameters * manage nagios.cfg through parameters -* manage nagios users +* manage Nagios users through external Puppet rules via define -* configure NRPE on clients +* manage Nagios commands through +Puppet exports +* configure NRPE on clients (optional) +* configure firewall (optional) -* configure firewall (optional) -* configure selinux policies -(optional) -* configure forwarding http to https including accesing the -/nagios url directly (optional) -* manage TLS certificates through certbot -(optional)

    +* configure selinux policies (optional) +* configure forwarding +http to https including accesing the /nagios url directly (optional) +* +manage TLS certificates through certbot (optional)

    Service * manage Nagios service on server @@ -337,7 +338,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 53a29cd..79b0b3c 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -96,35 +96,42 @@
    • -
  • +
  • +
    + cd_nagios::nagios::objects::commands +
    +
    • + + +
  • cd_nagios::params
    • -
  • +
  • cd_nagios::selinux::config
    • -
  • +
  • cd_nagios::server::access_rules
    • -
  • +
  • cd_nagios::server::files
    • -
  • +
  • cd_nagios::server::service
    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 1127305..f1c943f 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index a545981..c035721 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 2a5bdc3..27890a0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index fce13b4..f1ad5b9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index c5f144a..30e3a93 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index fcd68d0..110c7f2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 0b67770..0a24015 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 35d9e5a..7899f32 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html new file mode 100644 index 0000000..bc907ec --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -0,0 +1,604 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::commands + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::commands

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/commands.pp +
    +
    +
    + +

    Summary

    + Class manages all configuration files required for cd_nagios. + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::commands.pp +Module name: cd_nagios +Author: Arne +Teuke (arne_teuke@ConfDroid.com)

    + +

    License:

    + +

    This file is part of cd_nagios.

    + +

    cd_nagios is used for providing automatic configuration of Nagios + +Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com) + This program is +free software: you can redistribute it and/or modify + it under the terms of +the GNU General Public License as published by + the Free Software +Foundation, either version 3 of the License, or + (at your option) any later +version.

    + +

    This program is distributed in the hope that it will be useful, + but +WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License +for more details.

    + +

    You should have received a copy of the GNU General Public License + along +with this program. If not, see www.gnu.org/licenses/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
    +     		+ 
    # File 'manifests/nagios/objects/commands.pp', line 23
+
+class cd_nagios::nagios::objects::commands (
+
+) inherits cd_nagios::params {
+
+  require cd_nagios::main::install
+
+  @@nagios_command { 'notify-host-by-email':
+    ensure        =>  present,
+    command_name  =>  'notify-host-by-email',
+    command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'notify-service-by-email':
+    ensure        =>  present,
+    command_name  =>  'notify-service-by-email',
+    command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check-host-alive':
+    ensure        =>  present,
+    command_name  =>  'check-host-alive',
+    command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_disk':
+    ensure        =>  present,
+    command_name  =>  'check_disk',
+    command_line  =>  '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_load':
+    ensure        =>  present,
+    command_name  =>  'check_local_load',
+    command_line  =>  '$USER1$/check_load -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_procs':
+    ensure        =>  present,
+    command_name  =>  'check_local_procs',
+    command_line  =>  '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_users':
+    ensure        =>  present,
+    command_name  =>  'check_local_users',
+    command_line  =>  '$USER1$/check_users -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_swap':
+    ensure        =>  present,
+    command_name  =>  'check_local_swap',
+    command_line  =>  '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_ftp':
+    ensure        =>  present,
+    command_name  =>  'check_ftp',
+    command_line  =>  '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_snmp':
+    ensure        =>  present,
+    command_name  =>  'check_snmp',
+    command_line  =>  '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_http':
+    ensure        =>  present,
+    command_name  =>  'check_http',
+    command_line  =>  '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_ssh':
+    ensure        =>  present,
+    command_name  =>  'check_ssh',
+    command_line  =>  '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_ping':
+    ensure        =>  present,
+    command_name  =>  'check_ping',
+    command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_tcp':
+    ensure        =>  present,
+    command_name  =>  'check_tcp',
+    command_line  =>  '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_udp':
+    ensure        =>  present,
+    command_name  =>  'check_udp',
+    command_line  =>  '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_nrpe':
+    ensure        =>  present,
+    command_name  =>  'check_nrpe',
+    command_line  =>  '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_nagios':
+    ensure        =>  present,
+    command_name  =>  'check_nagios',
+    command_line  =>  '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_bandwidth':
+    ensure        =>  present,
+    command_name  =>  'check_bandwidth',
+    command_line  =>  '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command  { 'check_jenkins_api':
+    ensure        =>  present,
+    command_name  =>  'check_jenkins_api',
+    command_line  =>  '$USER1$/check_http -H $HOSTADDRESS$ -u /api/xml?depth=0 -R quietingDown.false $ARG1$ $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+
+  @@nagios_command { 'process-service-perfdata-file':
+    ensure        =>  present,
+    command_name  =>  'process-service-perfdata-file',
+    command_line  =>  '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'process-host-perfdata-file':
+    ensure        =>  present,
+    command_name  =>  'process-host-perfdata-file',
+    command_line  =>  '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command {  'check_ntp_time':
+    ensure        =>  present,
+    command_name  =>  'check_ntp_time',
+    command_line  =>  '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index bf9b17e..25a71f9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -89,6 +89,8 @@ cd_nagios::server::access_rules
    + cd_nagios::nagios::objects::commands
    + @@ -5551,7 +5553,7 @@ $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index 519d67e..38bd21a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index e984ea0..d959d0e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index dc045f4..ec0e8a8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -334,7 +334,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 235aa00..4886b7f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -266,7 +266,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index f4134cf..7bacdd4 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index bcc5013..cee4a67 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From cc2d2cbf2968ccecb7576b9312a9ec8cdf726f4d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 25 Jul 2017 17:57:28 +0200 Subject: [PATCH 02/11] recommit for updates in build 90 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 12 +- doc/_index.html | 12 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 17 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 11 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 219 ++++++++++++ doc/puppet_classes/cd_nagios_3A_3Aparams.html | 10 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 8 +- doc/puppet_defined_type_list.html | 9 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 316 ++++++++++++++++++ .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 25 files changed, 619 insertions(+), 35 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b6dc2..2a1a4c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +b4b3de53a39ef00 Jenkins Server 2017-07-25 14:48:58 +

    +

    recommit for updates in build 84

    + +

    +3327f6d8692753b Arne Teuke 2017-07-25 14:48:39 +

    +

    added commands.pp

    + +

    4ae4a056901361a Jenkins Server 2017-07-25 14:34:30

    recommit for updates in build 83

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 9261220..b978031 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -17,6 +17,7 @@ | | |-- cd_nagios_3A_3Amain_3A_3Adirs.html | | |-- cd_nagios_3A_3Amain_3A_3Ainstall.html | | |-- cd_nagios_3A_3Amain_3A_3Auser.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | | |-- cd_nagios_3A_3Aparams.html | | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html | | |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -46,7 +47,9 @@ | | `-- user.pp | |-- nagios | | `-- objects -| | `-- commands.pp +| | |-- commands.pp +| | |-- template_rules.pp +| | `-- templates.pp | |-- selinux | | `-- config.pp | |-- server @@ -68,7 +71,10 @@ | |-- nagios | | |-- cgi_cfg.erb | | |-- htpasswd_rule.erb -| | `-- nagios_cfg.erb +| | |-- nagios_cfg.erb +| | |-- templates_cfg.erb +| | |-- templates_cfg_head.erb +| | `-- templates_cfg_rule.erb | `-- selinux | |-- statuscgi.erb | `-- taccgi.erb @@ -82,4 +88,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 62 files +20 directories, 68 files diff --git a/doc/_index.html b/doc/_index.html index 64f9fc8..aa19c87 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -113,6 +113,11 @@
    • +
  • + cd_nagios::nagios::objects::template_rules + +
    • +
  • cd_nagios::params @@ -158,6 +163,11 @@
  • C
    • @@ -243,35 +338,35 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

     
 
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
    +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 - 
    # File 'manifests/nagios/objects/templates.pp', line 23
+        
    # File 'manifests/nagios/objects/templates.pp', line 53
 
 define cd_nagios::nagios::objects::templates (
 
@@ -306,7 +401,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index ec329c8..97dd078 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 2f4cabc..742ac62 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 445db500b3ab876c100b4116e25e38bf388d52fb Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 25 Jul 2017 18:15:39 +0200
Subject: [PATCH 04/11] recommit for updates in build 92

---
 CHANGELOG.md                                           | 10 ++++++++++
 doc/_index.html                                        |  2 +-
 doc/file.README.html                                   |  2 +-
 doc/index.html                                         |  2 +-
 doc/puppet_classes/cd_nagios.html                      |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Acerts.html             |  2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html             |  2 +-
 .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html         |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html               |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html  |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html              |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html  |  2 +-
 ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html |  2 +-
 ...s_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html          |  2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html            |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html       |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html              |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html            |  2 +-
 ...nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | 10 +++-------
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html             |  2 +-
 doc/top-level-namespace.html                           |  2 +-
 22 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e83ede..1aa3e04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+a3517b81e663a07 Jenkins Server 2017-07-25 16:13:43
+
    
+
    recommit for updates in build 91
    
+
+
    
+e03a5d94750b182 Arne Teuke 2017-07-25 16:13:25
+
    
+
    added parameter documentation
    
+
+
    
 cc2d2cbf2968cce Jenkins Server 2017-07-25 15:57:28
 
    
 
    recommit for updates in build 90
    
diff --git a/doc/_index.html b/doc/_index.html
index de848c9..6d3e204 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -201,7 +201,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 455bb3a..c8390ba 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -338,7 +338,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index c36ed39..0c88fde 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -338,7 +338,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index f14d582..5a159fc 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
index 7788d95..718f516 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 8e8c18e..79d4e07 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 6543c5a..65a4529 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 0984baa..f6bc446 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 364057a..f71b1ee 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 72d021a..3b885e8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 4963102..78755d0 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
index a7a2c1d..59ddc93 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index 67ce595..fc713bd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -211,7 +211,7 @@ class cd_nagios::nagios::objects::template_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 8d7d52b..436d0ea 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5557,7 +5557,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 160c13f..48bb1d5 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index a8e0098..a2ad9b2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 3eec314..faa7045 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index eefeb2f..66952c0 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -270,7 +270,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index 308433d..4228bc2 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -361,19 +361,16 @@ definition, we do not want to register those.
    
 73
 74
 75
-76
-77
-78
    
+76
    # File 'manifests/nagios/objects/templates.pp', line 53
 
 define cd_nagios::nagios::objects::templates (
-
 $ng_template_object               = undef,
 $ng_template_object_name          = undef,
 $ng_svc_notification_period       = '24x7',
-$ng_host_notification_period      = '24x7', 
+$ng_host_notification_period      = '24x7',
 $ng_service_notification_options  = 'w,u,c,r,f,s',
 $ng_host_notification_options     = 'd,u,r,f,s',
 $ng_service_notification_commands = 'notify-service-by-email',
@@ -381,7 +378,6 @@ $ng_host_notification_commands    = 'notify-host-by-email',
 $ng_object_register               = '0',
 
 ) {
-
 $ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
 $ng_target_templates    = $::cd_nagios::params::ng_target_templates
 $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
@@ -401,7 +397,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 97dd078..e207eba 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 742ac62..0088636 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From a23722a67a2afb691ca41038faf5e20602a2cd02 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 25 Jul 2017 19:56:39 +0200
Subject: [PATCH 05/11] recommit for updates in build 93

---
 CHANGELOG.md                                  |  10 +
 doc/_index.html                               |   2 +-
 doc/file.README.html                          |   2 +-
 doc/index.html                                |   2 +-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Acerts.html    |   2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html |   2 +-
 ...gios_3A_3Aobjects_3A_3Atemplate_rules.html |  75 ++-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |   2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   2 +-
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 597 +++++++++++++++++-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 22 files changed, 662 insertions(+), 58 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aa3e04..c06976b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+445db500b3ab876 Jenkins Server 2017-07-25 16:15:39
+
    
+
    recommit for updates in build 92
    
+
+
    
+b4e4ceb9b07cde4 Arne Teuke 2017-07-25 16:15:21
+
    
+
    added parameter documentation
    
+
+
    
 a3517b81e663a07 Jenkins Server 2017-07-25 16:13:43
 
    
 
    recommit for updates in build 91
    
diff --git a/doc/_index.html b/doc/_index.html
index 6d3e204..83e59cb 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -201,7 +201,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index c8390ba..078b03e 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -338,7 +338,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 0c88fde..8d3596c 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -338,7 +338,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 5a159fc..612e56f 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
index 718f516..3d1152f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 79d4e07..ac6d322 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 65a4529..860d1fc 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index f6bc446..a974abe 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index f71b1ee..29f97e4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 3b885e8..edd3806 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 78755d0..9a28605 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
index 59ddc93..d320d4c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index fc713bd..e4e21b9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -115,8 +115,7 @@ for more details.
    
 
    You should have received a copy of the GNU General Public License
  along
 with this program. If not, see www.gnu.org/licenses/.
- }
    
+href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 
   
 
@@ -127,10 +126,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
     
       
         
    
-
    cd_nagios::objects::templates { $name:
    
+
    cd_nagios::nagios::objects::templates { 'generic contact':
    
 
    
       
-      
    ng_template_object => 'service',
    
+      
    ng_template_object      => 'contact',
+ng_template_object_name =>  'generic-contact',
+}
    
     
   
 
@@ -142,7 +143,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
         
     
 
-26
 27
 28
 29
@@ -170,10 +170,38 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
 51
 52
 53
-54
    
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
    - 
    # File 'manifests/nagios/objects/template_rules.pp', line 26
+        
    # File 'manifests/nagios/objects/template_rules.pp', line 27
 
 class cd_nagios::nagios::objects::template_rules (
 
@@ -197,11 +225,38 @@ class cd_nagios::nagios::objects::template_rules (
       notify    =>  Service[$ng_service],
     }
 
-    # example rule 
-    cd_nagios::objects::templates { 'generic contact':
+    # basic templates
+    cd_nagios::nagios::objects::templates { 'generic contact':
       ng_template_object      => 'contact',
       ng_template_object_name =>  'generic-contact',
     }
+    cd_nagios::nagios::objects::templates { 'generic-host':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-host',
+    }
+    cd_nagios::nagios::objects::templates { 'linux-server':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'linux-server',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
+    cd_nagios::nagios::objects::templates { 'windows-server':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'windows-server',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
+    cd_nagios::nagios::objects::templates { 'generic-service':
+      ng_template_object      =>  'service',
+      ng_template_object_name =>  'generic-service',
+      ng_max_check_attempts   =>  '3',
+      ng_notification_options =>  'w,u,c,r',
+    }
+    cd_nagios::nagios::objects::templates { 'local-service':
+      ng_template_object      =>  'service',
+      ng_template_object_name =>  'generic-service',
+      ng_max_check_attempts   =>  '4',
+    }
   }
 }
    
       
@@ -211,7 +266,7 @@ class cd_nagios::nagios::objects::template_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 436d0ea..e8aabb4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5557,7 +5557,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 48bb1d5..f6eed7a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index a2ad9b2..6100b63 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index faa7045..e20de0b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 66952c0..755f07d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -270,7 +270,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index 4228bc2..5379fda 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -108,7 +108,9 @@ for more details.
    
 
    You should have received a copy of the GNU General Public License
  along
 with this program. If not, see www.gnu.org/licenses/.
    
+href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
+notifications.
+for the defined service or host.
    
 
   
 
@@ -130,7 +132,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         —
         
    
 
    the object type for the templates.
-valid options are contact,
+Valid options are contact,
 host and service.
    
 
    
       
@@ -247,7 +249,7 @@ r = notify on host
 recoveries (UP states),
 f = notify when the host starts and stops
 flapping,
-s = snotify when host or service scheduled downtime starts and
+s = notify when host or service scheduled downtime starts and
 ends.
 n = none (the contact will not receive any type of host
 notifications).
    
@@ -315,6 +317,478 @@ definition, we do not want to register those.
    
       
     
   
+    
  • 
+      
+        ng_template_object_use
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
    
+
    Which template to use for a given
+host or service definition, i.e.
+generic-host, generic-service etc.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notifications_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether notifications are enabled.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_event_handler_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether event handlers are enabled.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_flap_detection_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether flap detection is enabled.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_failure_prediction_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether failure prediction is
+enabled. Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_process_perf_data
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to process performance data.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retain_status_information
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to retain status
+information. Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retain_nonstatus_information
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to retain non-status
+information. Valid options are 0
+and 1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notification_period
+      
+      
+        (string)
+      
+      
+        (defaults to: '24x7')
+      
+      
+        —
+        
    
+
    Which period in to send out
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notification_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '30')
+      
+      
+        —
+        
    
+
    Whoe often (in minutes) we should
+resend notifications for the current
+status.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_check_period
+      
+      
+        (string)
+      
+      
+        (defaults to: '24x7')
+      
+      
+        —
+        
    
+
    Which period in to run checks for the defined
+object.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_check_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '5')
+      
+      
+        —
+        
    
+
    How often in minutes to check the defined
+object.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retry_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    at what interval in minutes to schedule
+retries for the defined object.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_max_check_attempts
+      
+      
+        (string)
+      
+      
+        (defaults to: '10')
+      
+      
+        —
+        
    
+
    how often to check the defined object
+maximal.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notification_options
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
    
+
    see ng_service_notification_options
+and
+ng_host_notification_options.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_contact_groups
+      
+      
+        (string)
+      
+      
+        (defaults to: 'admins')
+      
+      
+        —
+        
    
+
    contact groups for the defined oject.
+Specified contact group must exit in
+contact_groups
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_active_checks_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to enable active checks.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_passive_checks_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to enable passive checks.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_parallelize_check
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to parallelize checks
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_obsess_over_service
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to obsess over the service.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_check_freshness
+      
+      
+        (string)
+      
+      
+        (defaults to: '0')
+      
+      
+        —
+        
    
+
    Whether to check freshness.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_is_volatile
+      
+      
+        (string)
+      
+      
+        (defaults to: '0')
+      
+      
+        —
+        
    
+
    Whether the service is volatile.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_normal_check_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '10')
+      
+      
+        —
+        
    
+
    How often to check the service
+under normal conditions.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retry_check_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '2')
+      
+      
+        —
+        
    
+
    Re-check the service every x minutes
+until a hard state can be determined.
    
+
    
+      
+    
    • 
+  
     
  • 
       
         ng_host_notification_period
@@ -328,6 +802,19 @@ definition, we do not want to register those.
    
       
     
    • 
   
+    
  • 
+      
+        ng_check_command
+      
+      
+        (Any)
+      
+      
+        (defaults to: 'check-host-alive')
+      
+      
+    
    • 
+  
 
 
 
@@ -338,33 +825,59 @@ definition, we do not want to register those.
    
         
     
 
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
    
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
    - 
    # File 'manifests/nagios/objects/templates.pp', line 53
+        
    # File 'manifests/nagios/objects/templates.pp', line 101
 
 define cd_nagios::nagios::objects::templates (
 $ng_template_object               = undef,
@@ -376,6 +889,32 @@ $ng_host_notification_options     = 'd,u,r,f,s',
 $ng_service_notification_commands = 'notify-service-by-email',
 $ng_host_notification_commands    = 'notify-host-by-email',
 $ng_object_register               = '0',
+$ng_template_object_use           = undef,
+$ng_notifications_enabled         = '1',
+$ng_event_handler_enabled         = '1',
+$ng_flap_detection_enabled        = '1',
+$ng_failure_prediction_enabled    = '1',
+$ng_process_perf_data             = '1',
+$ng_retain_status_information     = '1',
+$ng_retain_nonstatus_information  = '1',
+$ng_notification_period           = '24x7',
+$ng_notification_interval         = '30',
+$ng_check_period                  = '24x7',
+$ng_check_interval                = '5',
+$ng_retry_interval                = '1',
+$ng_max_check_attempts            = '10',
+$ng_check_command                 = 'check-host-alive',
+$ng_notification_options          = undef,
+$ng_contact_groups                = 'admins',
+$ng_active_checks_enabled         = '1',
+$ng_passive_checks_enabled        = '1',
+$ng_parallelize_check             = '1',
+$ng_obsess_over_service           = '1',
+$ng_check_freshness               = '0',
+$ng_is_volatile                   = '0',
+$ng_normal_check_interval         = '10',
+$ng_retry_check_interval          = '2',
+
 
 ) {
 $ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
@@ -397,7 +936,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index e207eba..84b7fad 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 0088636..22cdb75 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 62feddee64c23f95a3d750675b49cdd410a100a1 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 25 Jul 2017 20:04:08 +0200
Subject: [PATCH 06/11] recommit for updates in build 96

---
 CHANGELOG.md                                  | 10 +++++
 doc/_index.html                               |  2 +-
 doc/file.README.html                          |  2 +-
 doc/index.html                                |  2 +-
 doc/puppet_classes/cd_nagios.html             |  2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Acerts.html    |  2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |  2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |  2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |  2 +-
 ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html |  2 +-
 ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 42 +++++++++++++++++--
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  2 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |  2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |  2 +-
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 22 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c06976b..6971968 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39
+
    
+
    recommit for updates in build 93
    
+
+
    
+a04f079a6cbeec8 Arne Teuke 2017-07-25 17:56:18
+
    
+
    testing templates
    
+
+
    
 445db500b3ab876 Jenkins Server 2017-07-25 16:15:39
 
    
 
    recommit for updates in build 92
    
diff --git a/doc/_index.html b/doc/_index.html
index 83e59cb..64a6a02 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -201,7 +201,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 078b03e..847e1e1 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -338,7 +338,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 8d3596c..43a545d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -338,7 +338,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 612e56f..d3f995c 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
index 3d1152f..8b06151 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index ac6d322..72934df 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 860d1fc..0781ded 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index a974abe..27c2b69 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index 29f97e4..a05034f 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index edd3806..4ec13a9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 9a28605..75db801 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
index d320d4c..4c5f71c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index e4e21b9..9784b65 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -198,7 +198,25 @@ ng_template_object_name =>  'generic-contact',
 79
 80
 81
-82
    
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
    # File 'manifests/nagios/objects/template_rules.pp', line 27
@@ -221,10 +239,16 @@ class cd_nagios::nagios::objects::template_rules (
       selrole   =>  object_r,
       seltype   =>  nagios_etc_t,
       seluser   =>  system_u,
-      content   =>  template[$ng_templates_head_erb],
       notify    =>  Service[$ng_service],
     }
 
+  concat::fragment { 'header':
+    target    =>  $ng_target_templates,
+    content   =>  template($ng_templates_head_erb),
+    order     =>  '000',
+    }
+
+
     # basic templates
     cd_nagios::nagios::objects::templates { 'generic contact':
       ng_template_object      => 'contact',
@@ -246,6 +270,18 @@ class cd_nagios::nagios::objects::template_rules (
       ng_template_object_use  =>  'generic-host',
       ng_notification_options =>  'd,u,r',
     }
+    cd_nagios::nagios::objects::templates { 'generic-switch':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-switch',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
+    cd_nagios::nagios::objects::templates { 'generic-printer':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-printer',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
     cd_nagios::nagios::objects::templates { 'generic-service':
       ng_template_object      =>  'service',
       ng_template_object_name =>  'generic-service',
@@ -266,7 +302,7 @@ class cd_nagios::nagios::objects::template_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index e8aabb4..8b7de87 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5557,7 +5557,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index f6eed7a..a7b27c0 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 6100b63..461c1a9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index e20de0b..948a9c2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 755f07d..c4b28b2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -270,7 +270,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index 5379fda..ac06627 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -936,7 +936,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 84b7fad..ba71a9b 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 22cdb75..5554661 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From d395b5f60d08f612b779bf9c92184ed750fa51a6 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Wed, 26 Jul 2017 13:16:49 +0200
Subject: [PATCH 07/11] recommit for updates in build 97

---
 CHANGELOG.md                                  |  15 +
 REPOSTRUCTURE.md                              |  10 +-
 doc/_index.html                               |  22 +-
 doc/file.README.html                          |  32 +-
 doc/index.html                                |  32 +-
 doc/puppet_class_list.html                    |  35 ++-
 doc/puppet_classes/cd_nagios.html             |   2 +-
 .../cd_nagios_3A_3Acertbot_3A_3Acerts.html    |   2 +-
 .../cd_nagios_3A_3Aclient_3A_3Atarget.html    |   2 +-
 ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Aconfig.html      |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Adirs.html        |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Ainstall.html     |   2 +-
 .../cd_nagios_3A_3Amain_3A_3Auser.html        |   2 +-
 ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 238 ++++++++++++++
 ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html |   2 +-
 ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 174 +++++++++++
 ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 290 ++++++++++++++++++
 ...gios_3A_3Aobjects_3A_3Atemplate_rules.html |  11 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  20 +-
 .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html   |   2 +-
 ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Afiles.html     |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aservice.html   |   8 +-
 doc/puppet_defined_type_list.html             |  11 +-
 ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 235 ++++++++++++++
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |  43 ++-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 29 files changed, 1124 insertions(+), 80 deletions(-)
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
 create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6971968..215c319 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+62feddee64c23f9 Jenkins Server 2017-07-25 18:04:08
+
    
+
    recommit for updates in build 96
    
+
+
    
+099828e47a377d2 Arne Teuke 2017-07-25 18:02:29
+
    
+
    testing templates
    
+
+
    
+336e03f6090e222 Arne Teuke 2017-07-25 18:01:03
+
    
+
    testing templates
    
+
+
    
 a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39
 
    
 
    recommit for updates in build 93
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 0ed4ca0..d3de3ff 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -49,7 +49,11 @@
 |   |   `-- user.pp
 |   |-- nagios
 |   |   `-- objects
+|   |       |-- add_contact.pp
+|   |       |-- add_contact_rules.pp
 |   |       |-- commands.pp
+|   |       |-- config.pp
+|   |       |-- contacts.pp
 |   |       |-- template_rules.pp
 |   |       `-- templates.pp
 |   |-- selinux
@@ -72,9 +76,11 @@
 |   |   `-- nagios_ssl_vhost.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
+|   |   |-- contacts_cfg.erb
+|   |   |-- contacts_cfg_head.erb
+|   |   |-- contacts_cfg_rule.erb
 |   |   |-- htpasswd_rule.erb
 |   |   |-- nagios_cfg.erb
-|   |   |-- templates_cfg.erb
 |   |   |-- templates_cfg_head.erb
 |   |   `-- templates_cfg_rule.erb
 |   `-- selinux
@@ -90,4 +96,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 70 files
+20 directories, 76 files
diff --git a/doc/_index.html b/doc/_index.html
index 64a6a02..04af5c1 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -108,11 +108,26 @@
       
             
     
+            
  • 
+      cd_nagios::nagios::objects::add_contact_rules
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::commands
       
             
    • 
     
+            
  • 
+      cd_nagios::nagios::objects::config
+      
+            
    • 
+    
+            
  • 
+      cd_nagios::nagios::objects::contacts
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::template_rules
       
@@ -163,6 +178,11 @@
         
  • C
    • 
           
      
     
+            
    • 
+      cd_nagios::nagios::objects::add_contact
+      
+            
      • 
+    
             
    • 
       cd_nagios::nagios::objects::templates
       
@@ -201,7 +221,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 847e1e1..41ad619 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -145,14 +145,20 @@ parameters
 through external Puppet rules via define
 * manage Nagios commands through
 Puppet exports
-* configure NRPE on clients (optional)
-* configure firewall
-(optional)
-* configure selinux policies (optional)
-* configure forwarding
-http to https including accesing the /nagios url directly (optional)
-*
-manage TLS certificates through certbot (optional)
      
+* manage Nagios template definitions through external Puppet
+rules via define
+* manage Nagios main contacts through Puppet exports.
+Additional contacts can be created through external Puppet rules via
+define, to avoid having to alter the module code.
+* configure NRPE on
+clients (optional)
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)
      
 
 
      Service
 * manage Nagios service on server
@@ -184,6 +190,14 @@ for selinux policy adjustments
      
 
    • 
 
      cd_certbot
 to auto-manage TLS certificates (optional)
      
+
    • 
+
      cd_stdlib or
+puppetlabs
+stdlib to facilitate concat
      
+
    • 
+
      cd-concat or
+puppetlabs
+concat to concatenate configuration files from different sources.
      
 
    
 
 
    Deployment
    
@@ -338,7 +352,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 43a545d..8873d0e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -145,14 +145,20 @@ parameters
 through external Puppet rules via define
 * manage Nagios commands through
 Puppet exports
-* configure NRPE on clients (optional)
-* configure firewall
-(optional)
-* configure selinux policies (optional)
-* configure forwarding
-http to https including accesing the /nagios url directly (optional)
-*
-manage TLS certificates through certbot (optional)
    
+* manage Nagios template definitions through external Puppet
+rules via define
+* manage Nagios main contacts through Puppet exports.
+Additional contacts can be created through external Puppet rules via
+define, to avoid having to alter the module code.
+* configure NRPE on
+clients (optional)
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -184,6 +190,14 @@ for selinux policy adjustments
    
 
  • 
 
    cd_certbot
 to auto-manage TLS certificates (optional)
    
+
  • 
+
    cd_stdlib or
+puppetlabs
+stdlib to facilitate concat
    
+
  • 
+
    cd-concat or
+puppetlabs
+concat to concatenate configuration files from different sources.
    
 
    • 
 
 
    Deployment
    
@@ -338,7 +352,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 4a0751b..ef22ac1 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -96,49 +96,70 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_contact_rules
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::commands
       
    
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::config
+      
    
+    
    • 
+    
+
+    
  • 
+      
    
+        cd_nagios::nagios::objects::contacts
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::template_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::params
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::selinux::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::service
       
    
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index d3f995c..0b79a94 100644
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
index 8b06151..bcd384a 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
index 72934df..6d6a6b6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
index 0781ded..4155ac2 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
index 27c2b69..50981cb 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
index a05034f..cba2537 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
index 4ec13a9..64bc256 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
index 75db801..e38567e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
new file mode 100644
index 0000000..4e4fe93
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
@@ -0,0 +1,238 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::add_contact_rules
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::add_contact_rules
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_contact_rules.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages /etc/nagios/conf.d/nagios_add_contact.cfg through
+concat.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_contact_rules.pp
+Module name:
+cd_nagios
+Author: Arne Teuke (arne_teuke@ConfDroid.com)
    
+
+
    License:
    
+
+
    This file is part of cd_nagios.
    
+
+
    cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.
    
+
+
    This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.
    
+
+
    You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see www.gnu.org/licenses/.
+cd_nagios::nagios::objects::add_contact
+{ 'example_user':
+ ng_contact_name => 'example_user',
+
+ng_contact_alias => 'Example User',
+ ng_contact_groups =>
+'admins',
+ ng_contact_email => 'example@example.net',
+ }
    
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
    
+          		
+        
    # File 'manifests/nagios/objects/add_contact_rules.pp', line 31
+
+class cd_nagios::nagios::objects::add_contact_rules (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/conf.d/nagios_add_contacts.cfg
+
+    concat { $ng_target_add_contact:
+      ensure    =>  present,
+      path      =>  $ng_target_add_contact,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'header':
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_head_erb),
+      order     =>  '000',
+    }
+
+    # example rule for testing
+
+    cd_nagios::nagios::objects::add_contact { 'example_user':
+      ng_contact_name   =>  'example_user',
+      ng_contact_alias  =>  'Example User',
+      ng_contact_groups =>  'admins',
+      ng_contact_email  =>  'example@example.net',
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
index 4c5f71c..b6d49bd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
new file mode 100644
index 0000000..455ab7e
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -0,0 +1,174 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::config
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::config
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/config.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages the nagios objects definitions.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::server::nagios::objects::config.pp
+Module name:
+cd_nagios
+Author: Arne Teuke (arne_teuke@ConfDroid.com)
    
+
+
    License:
    
+
+
    This file is part of cd_nagios.
    
+
+
    cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.
    
+
+
    This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.
    
+
+
    You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see www.gnu.org/licenses/.
    
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
    
+          		
+        
    # File 'manifests/nagios/objects/config.pp', line 23
+
+class cd_nagios::nagios::objects::config (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    require cd_nagios::nagios::objects::commands
+    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::add_contact_rules
+
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
new file mode 100644
index 0000000..c6e9de2
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
@@ -0,0 +1,290 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::contacts
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::contacts
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/contacts.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages basic contacts known to NAGIOS through Puppet exports,
+and populates /etc/nagios/conf.d/nagios_base_contacts.cfg.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::contacts.pp
+Module name: cd_nagios
+Author: Arne
+Teuke (arne_teuke@ConfDroid.com)
    
+
+
    License:
    
+
+
    This file is part of cd_nagios.
    
+
+
    cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.
    
+
+
    This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.
    
+
+
    You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see www.gnu.org/licenses/.
    
+
+  
    
+
    
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    @@nagios_contact { 'admin':
+  ensure              =>  present,
+  alias               =>  'Nagios Admin',
+  contact_name        =>  'admin',
+  contactgroups       =>  'admins',
+  email               =>  "admin@${::domain}",
+  can_submit_commands =>  '1',
+  register            =>  '1',
+  use                 =>  'generic-contact',
+  target              =>  $ng_target_base_contact,
+  owner               =>  'root',
+  group               =>  'nagios',
+  mode                =>  '0664',
+}
    
+    
+  
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
    
+          		
+        
    # File 'manifests/nagios/objects/contacts.pp', line 39
+
+class cd_nagios::nagios::objects::contacts (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    #  admin contact
+
+    @@nagios_contact { 'admin':
+      ensure              =>  present,
+      alias               =>  'Nagios Admin',
+      contact_name        =>  'admin',
+      contactgroups       =>  'admins',
+      email               =>  "admin@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+
+    # ops contact
+
+    @@nagios_contact { 'ops':
+      ensure              =>  present,
+      alias               =>  'Operations',
+      contact_name        =>  'ops',
+      contactgroups       =>  'operations',
+      email               =>  "ops@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+
+   # support contact
+
+    @@nagios_contact { 'support':
+      ensure              =>  present,
+      alias               =>  'support',
+      contact_name        =>  'support',
+      contactgroups       =>  'support',
+      email               =>  "support@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index 9784b65..6f0c5c9 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -77,7 +77,8 @@
 
 
   
    Summary
    
-  Class manages /etc/nagios/conf.d/templates.cfg through concat.
+  Class manages /etc/nagios/conf.d/nagios_templates.cfg through
+concat.
 
 
    Overview
    
 
    
@@ -143,7 +144,6 @@ ng_template_object_name =>  'generic-contact',
         
     
 
-27
 28
 29
 30
@@ -216,10 +216,11 @@ ng_template_object_name =>  'generic-contact',
 97
 98
 99
-100
    
+100
+101
    • - 
    # File 'manifests/nagios/objects/template_rules.pp', line 27
+        
    # File 'manifests/nagios/objects/template_rules.pp', line 28
 
 class cd_nagios::nagios::objects::template_rules (
 
@@ -302,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 8b7de87..9c7ed13 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -89,10 +89,16 @@
       
       cd_nagios::server::access_rules
    
       
+      cd_nagios::nagios::objects::config
    
+      
       cd_nagios::nagios::objects::commands
    
       
+      cd_nagios::nagios::objects::contacts
    
+      
       cd_nagios::nagios::objects::template_rules
    
       
+      cd_nagios::nagios::objects::add_contact_rules
    
+      
     
   
   
@@ -5207,7 +5213,10 @@ up
    
 980
 981
 982
-983
    
+983
+984
+985
+986
    # File 'manifests/params.pp', line 646
@@ -5528,7 +5537,7 @@ $ng_certbot_check         = "${ng_certbot_archive}/${ng_webserver_name}/cer
 $ng_certbot_live          = "${ng_certbot_main_dir}/live"
 
 # nagios
-$ng_target_templates      = "${ng_conf_d_dir}/templates.cfg"
+$ng_target_templates      = "${ng_conf_d_dir}/nagios_templates.cfg"
 $ng_templates_head_erb    = 'cd_nagios/nagios/templates_cfg_head.erb'
 $ng_templates_rule_erb    = 'cd_nagios/nagios/templates_cfg_rule.erb'
 $ng_target_timeperiods    = "${ng_conf_d_dir}/timeperiods.cfg"
@@ -5540,7 +5549,10 @@ $ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg&quo
 $ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
 $ng_target_service        = "${ng_conf_d_dir}/nagios_service.cfg"
 $ng_target_servicegroup   = "${ng_conf_d_dir}/nagios_servicegroup.cfg"
-$ng_target_contact        = "${ng_conf_d_dir}/nagios_contact.cfg"
+$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_base_contact.cfg"
+$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
+$ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
+$ng_contact_rule_erb      = 'cd_nagios/nagios/contact_cfg_rule.erb'
 $ng_target_contactgroup   = "${ng_conf_d_dir}/nagios_contactgroup.cfg"
 $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
@@ -5557,7 +5569,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index a7b27c0..84db028 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 461c1a9..72b76b8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index 948a9c2..28df8a5 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index c4b28b2..2c40cda 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -192,8 +192,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 83
 84
 85
-86
-87
    +86 
    # File 'manifests/server/service.pp', line 23
@@ -206,8 +205,7 @@ class cd_nagios::server::service (
 
     require cd_nagios::server::files
     require cd_nagios::server::access_rules
-    require cd_nagios::nagios::objects::commands
-    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::config
 
     service { $ng_service:
       ensure      => running,
@@ -270,7 +268,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index cf5fe31..c86cc98 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -40,14 +40,21 @@
       
    # File 'manifests/nagios/objects/add_contact.pp', line 25
@@ -217,6 +228,17 @@ $ng_contact_groups  = undef,
 
 ) {
 
+$ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
+$ng_target_add_contact  = $::cd_nagios::params::ng_target_add_contact
+$ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_rule_erb),
+    }
+  }
 }
    @@ -225,7 +247,7 @@ $ng_contact_groups = undef, diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 7227920..65ba357 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html @@ -935,7 +935,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 69bdeab..ec7cc20 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index eb411f0..ecb2697 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 19d33cb8a512c2fe07424428cbaa3e76639848e3 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 14:40:46 +0200 Subject: [PATCH 10/11] recommit for updates in build 102 --- CHANGELOG.md | 15 +++++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...agios_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...os_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ...gios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...os_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 4 ++-- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- ...3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 26 files changed, 41 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41941b2..4adae6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

    No issue

    +5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37 +

    +

    recommit for updates in build 101

    + +

    +8fafc260c8a85c2 Arne Teuke 2017-07-26 12:36:14 +

    +

    finalizing contacts

    + +

    +04c206f448ff267 Arne Teuke 2017-07-26 12:34:50 +

    +

    finalizing contacts

    + +

    039523e1f69f07e Jenkins Server 2017-07-26 11:30:54

    recommit for updates in build 99

    diff --git a/doc/_index.html b/doc/_index.html index df3650e..58c4291 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -221,7 +221,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 2c83e21..5134422 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index aa46a6a..d7b0c24 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 1699e3a..55b8dee 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 020705e..c43f777 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index b60454b..7fbc9ec 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index b6e2d24..787a0fe 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index ea122de..f12d7b2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 7e70137..88c6bff 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 972e65c..701145f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 28e650b..e84f85a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html index 445c110..add7692 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html @@ -228,7 +228,7 @@ class cd_nagios::nagios::objects::add_contact_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index c9ceee8..3cce4e5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html index cb61b52..4b9df4a 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html @@ -166,7 +166,7 @@ class cd_nagios::nagios::objects::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html index 6241237..21ef054 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html @@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index bf7bca7..62071d2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html @@ -303,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 6f7443d..6c8de52 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5552,7 +5552,7 @@ $ng_target_servicegroup = "${ng_conf_d_dir}/nagios_servicegroup.cfg" $ng_target_base_contact = "${ng_conf_d_dir}/nagios_base_contact.cfg" $ng_target_add_contact = "${ng_conf_d_dir}/nagios_add_contact.cfg" $ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' -$ng_contacts_rule_erb = 'cd_nagios/nagios/contact_cfg_rule.erb' +$ng_contacts_rule_erb = 'cd_nagios/nagios/contacts_cfg_rule.erb' $ng_target_contactgroup = "${ng_conf_d_dir}/nagios_contactgroup.cfg" $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" @@ -5569,7 +5569,7 @@ $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index dc8a8a8..ae71284 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 03796e6..1a80a02 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 2436955..e2ad661 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -334,7 +334,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 22a35cd..7aaa1af 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html index 359cdc8..1a84bff 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html @@ -247,7 +247,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 65ba357..23b1d8e 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html @@ -935,7 +935,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index ec7cc20..5456c38 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index ecb2697..67428f1 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 4dd15fea28537773d130f7abc4c4fee116d230f6 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 14:48:06 +0200 Subject: [PATCH 11/11] recommit for updates in build 103 --- CHANGELOG.md | 10 +++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 22 ++----------------- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 4 ++-- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 26 files changed, 37 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4adae6e..81a368e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46 +

    +

    recommit for updates in build 102

    + +

    +6955770373d63a1 Arne Teuke 2017-07-26 12:40:23 +

    +

    fixed typo

    + +

    5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37

    recommit for updates in build 101

    diff --git a/doc/_index.html b/doc/_index.html index 58c4291..1c9bcdf 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -221,7 +221,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 5134422..0025fba 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index d7b0c24..9916c89 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 55b8dee..c0d73da 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index c43f777..b6e3966 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 7fbc9ec..60b8160 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 787a0fe..73d28d6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index f12d7b2..21d4073 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 88c6bff..4e089d5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 701145f..a69f3e4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index e84f85a..2426325 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html index add7692..12ac9fb 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html @@ -168,16 +168,7 @@ ng_contact_alias => 'Example User', 57 58 59 -60 -61 -62 -63 -64 -65 -66 -67 -68 -69 +60 
    # File 'manifests/nagios/objects/add_contact_rules.pp', line 31
@@ -210,15 +201,6 @@ class cd_nagios::nagios::objects::add_contact_rules (
       content   =>  template($ng_contacts_head_erb),
       order     =>  '000',
     }
-
-    # example rule for testing
-
-    cd_nagios::nagios::objects::add_contact { 'example_user':
-      ng_contact_name   =>  'example_user',
-      ng_contact_alias  =>  'Example User',
-      ng_contact_groups =>  'admins',
-      ng_contact_email  =>  'example@example.net',
-    }
   }
 }
    @@ -228,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index 3cce4e5..0f7b996 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html index 4b9df4a..f1c6b64 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html @@ -166,7 +166,7 @@ class cd_nagios::nagios::objects::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html index 21ef054..ba735f0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html @@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index 62071d2..f0deb08 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html @@ -291,7 +291,7 @@ class cd_nagios::nagios::objects::template_rules ( } cd_nagios::nagios::objects::templates { 'local-service': ng_template_object => 'service', - ng_template_object_name => 'generic-service', + ng_template_object_name => 'local-service', ng_max_check_attempts => '4', } } @@ -303,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 6c8de52..b771f49 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5569,7 +5569,7 @@ $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index ae71284..c29bc2e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -249,7 +249,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index 1a80a02..7eb5f71 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -195,7 +195,7 @@ class cd_nagios::server::access_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index e2ad661..c8a0978 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html @@ -334,7 +334,7 @@ class cd_nagios::server::files ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 7aaa1af..c0ecbaf 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,7 @@ class cd_nagios::server::service ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html index 1a84bff..48a2c75 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html @@ -247,7 +247,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 23b1d8e..cfae138 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html @@ -935,7 +935,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 5456c38..5e31b96 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 67428f1..c0c43c3 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@