Side by Side Diff: modules/nagios/manifests/server.pp
Issue 29469617:
#1634 - Update file resource syntax in module nagios (Closed)
Patch Set:
Created June 20, 2017, 5 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/nagios/manifests/client.pp ('K')
|
« modules/nagios/manifests/client.pp ('k')
|
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 $zone, | 8 $zone, |
| 9 $contacts = hiera('nagios::server::contacts', {}), | 9 $contacts = hiera('nagios::server::contacts', {}), |
| 10 $contactgroups = hiera('nagios::server::contactgroups', {}), | 10 $contactgroups = hiera('nagios::server::contactgroups', {}), |
| 11 $commands = hiera('nagios::server::commands', {}), | 11 $commands = hiera('nagios::server::commands', {}), |
| 12 $services = hiera('nagios::server::services', {}), | 12 $services = hiera('nagios::server::services', {}), |
| 13 $hosts = hiera('nagios::server::hosts', {}), | 13 $hosts = hiera('nagios::server::hosts', {}), |
| 14 $hostgroups = hiera('nagios::server::hostgroups', {}), | 14 $hostgroups = hiera('nagios::server::hostgroups', {}), |
| 15 ) { | 15 ) { |
| 16 | 16 |
| 17 File { | 17 File { |
| 18 owner => 'root', | 18 owner => 'root', |
| 19 group => 'root', | 19 group => 'root', |
| 20 mode => 0644 | 20 mode => '0644' |
| 21 } | 21 } |
| 22 | 22 |
| 23 include nginx | 23 include nginx |
| 24 include spawn_fcgi | 24 include spawn_fcgi |
| 25 | 25 |
| 26 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi', | 26 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi', |
| 27 'fcgiwrap', 'pnp4nagios']: | 27 'fcgiwrap', 'pnp4nagios']: |
| 28 ensure => present | 28 ensure => present |
| 29 } | 29 } |
| 30 | 30 |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 notify => Service['nagios3'] | 161 notify => Service['nagios3'] |
| 162 } | 162 } |
| 163 | 163 |
| 164 create_resources(nagios_contact, $contacts) | 164 create_resources(nagios_contact, $contacts) |
| 165 create_resources(nagios_contactgroup, $contactgroups) | 165 create_resources(nagios_contactgroup, $contactgroups) |
| 166 create_resources(nagios_command, $commands) | 166 create_resources(nagios_command, $commands) |
| 167 create_resources(nagios_service, $services) | 167 create_resources(nagios_service, $services) |
| 168 create_resources(nagios_host, $hosts) | 168 create_resources(nagios_host, $hosts) |
| 169 create_resources(nagios_hostgroup, $hostgroups) | 169 create_resources(nagios_hostgroup, $hostgroups) |
| 170 } | 170 } |
| OLD | NEW |
« modules/nagios/manifests/client.pp ('K')
|
« modules/nagios/manifests/client.pp ('k')
|
no next file »
|
no next file with comments »
