Side by Side Diff: modules/nagios/manifests/server.pp
Issue 5189767234846720:
Quick-Fix in the context of #765 and #760 (Closed)
Patch Set:
Created July 10, 2014, 7:59 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 class nagios::server( | 1 class nagios::server( |
| 2 $domain, | 2 $domain, |
| 3 $certificate, | 3 $certificate, |
| 4 $private_key, | 4 $private_key, |
| 5 $is_default=false, | 5 $is_default=false, |
| 6 $htpasswd_source, | 6 $htpasswd_source, |
| 7 $admins | 7 $admins |
| 8 ) { | 8 ) { |
| 9 | 9 |
| 10 File { | 10 File { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 83 } | 83 } |
| 84 | 84 |
| 85 file {['/etc/nagios3/conf.d/contacts_nagios2.cfg', | 85 file {['/etc/nagios3/conf.d/contacts_nagios2.cfg', |
| 86 '/etc/nagios3/conf.d/extinfo_nagios2.cfg', | 86 '/etc/nagios3/conf.d/extinfo_nagios2.cfg', |
| 87 '/etc/nagios3/conf.d/generic-host_nagios2.cfg', | 87 '/etc/nagios3/conf.d/generic-host_nagios2.cfg', |
| 88 '/etc/nagios3/conf.d/generic-service_nagios2.cfg', | 88 '/etc/nagios3/conf.d/generic-service_nagios2.cfg', |
| 89 '/etc/nagios3/conf.d/hosts_nagios2.cfg', | 89 '/etc/nagios3/conf.d/hosts_nagios2.cfg', |
| 90 '/etc/nagios3/conf.d/hostgroups_nagios2.cfg', | 90 '/etc/nagios3/conf.d/hostgroups_nagios2.cfg', |
| 91 '/etc/nagios3/conf.d/localhost_nagios2.cfg', | 91 '/etc/nagios3/conf.d/localhost_nagios2.cfg', |
| 92 '/etc/nagios3/conf.d/services_nagios2.cfg']: | 92 '/etc/nagios3/conf.d/services_nagios2.cfg']: |
| 93 ensure => absent | 93 ensure => absent, |
| 94 before => Service['nagios3'] | |
| 94 } | 95 } |
| 95 | 96 |
| 96 resources {['nagios_contact', 'nagios_contactgroup', 'nagios_host', | 97 resources {['nagios_contact', 'nagios_contactgroup', 'nagios_host', |
| 97 'nagios_hostgroup', 'nagios_service']: | 98 'nagios_hostgroup', 'nagios_service']: |
| 98 purge => true | 99 purge => true |
| 99 } | 100 } |
| 100 | 101 |
| 101 Nagios_contact <| |> { | 102 Nagios_contact <| |> { |
| 102 target => '/etc/nagios3/conf.d/contacts.cfg', | 103 target => '/etc/nagios3/conf.d/contacts.cfg', |
| 103 require => Package['nagios3'], | 104 require => Package['nagios3'], |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 file {['/etc/nagios3/conf.d/contacts.cfg', | 138 file {['/etc/nagios3/conf.d/contacts.cfg', |
| 138 '/etc/nagios3/conf.d/contactgroups.cfg', | 139 '/etc/nagios3/conf.d/contactgroups.cfg', |
| 139 '/etc/nagios3/conf.d/commands.cfg', | 140 '/etc/nagios3/conf.d/commands.cfg', |
| 140 '/etc/nagios3/conf.d/hosts.cfg', | 141 '/etc/nagios3/conf.d/hosts.cfg', |
| 141 '/etc/nagios3/conf.d/hostgroups.cfg', | 142 '/etc/nagios3/conf.d/hostgroups.cfg', |
| 142 '/etc/nagios3/conf.d/services.cfg']: | 143 '/etc/nagios3/conf.d/services.cfg']: |
| 143 require => Package['nagios3'], | 144 require => Package['nagios3'], |
| 144 notify => Service['nagios3'] | 145 notify => Service['nagios3'] |
| 145 } | 146 } |
| 146 } | 147 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
