Delta Between Two Patch Sets: modules/nagios/manifests/server.pp
Issue 4810150141493248:
Issue 122 - Puppet ENC via Hiera (Closed)
Left Patch Set: 112 - Integrate run.py and monitoring with Hiera
Created Feb. 26, 2015, 5:32 p.m.
Right Patch Set: Puppet ENC via Hiera - Without Arrow Alignment
Created March 16, 2015, 2:04 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« modules/filtermaster/manifests/init.pp ('k')
|
modules/private-stub/hiera/base.yaml » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 $authority, | 8 $zone, |
| 9 ) { | 9 ) { |
| 10 | 10 |
| 11 File { | 11 File { |
| 12 owner => 'root', | 12 owner => 'root', |
| 13 group => 'root', | 13 group => 'root', |
| 14 mode => 0644 | 14 mode => 0644 |
| 15 } | 15 } |
| 16 | 16 |
| 17 include nginx, 'spawn-fcgi' | 17 include nginx, 'spawn-fcgi' |
| 18 | 18 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 164 | 164 |
| 165 $nagios_hostgroups = hiera('nagios_hostgroups', {}) | 165 $nagios_hostgroups = hiera('nagios_hostgroups', {}) |
| 166 create_resources(nagios_hostgroup, $nagios_hostgroups) | 166 create_resources(nagios_hostgroup, $nagios_hostgroups) |
| 167 | 167 |
| 168 $nagios_generic = hiera('servers') | 168 $nagios_generic = hiera('servers') |
| 169 create_resources(nagios::server::generic_host, $nagios_generic) | 169 create_resources(nagios::server::generic_host, $nagios_generic) |
| 170 | 170 |
| 171 define generic_host( | 171 define generic_host( |
| 172 $ip, | 172 $ip, |
| 173 $ssh_public_key = undef, | 173 $ssh_public_key = undef, |
| 174 $role = undef, | 174 $role = undef, |
| 175 $dns = undef, | 175 $dns = undef, |
| 176 $groups = [], | 176 $groups = [], |
| 177 ) { | 177 ) { |
| 178 | 178 |
| 179 $fqdn_name = join([$name, $nagios::server::authority], ".") | 179 $fqdn_name = join([$name, $nagios::server::zone], '.') |
| 180 | 180 |
| 181 nagios_host {$fqdn_name: | 181 nagios_host {$fqdn_name: |
| 182 use => 'generic-host', | 182 use => 'generic-host', |
| 183 hostgroups => $groups, | 183 hostgroups => $groups, |
| 184 } | 184 } |
| 185 } | 185 } |
| 186 } | 186 } |
| LEFT | RIGHT |
« modules/filtermaster/manifests/init.pp ('k')
|
modules/private-stub/hiera/base.yaml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
