Side by Side Diff: manifests/monitoringserver.pp
Issue 4810150141493248:
Issue 122 - Puppet ENC via Hiera (Closed)
Patch Set: 112 - Puppet ENC via Hiera
Created Oct. 8, 2014, 3:02 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« hiera/puppet-node-classifier.rb ('K')
|
« manifests/issuesserver.pp ('k')
|
manifests/nodes.pp » ('j')
|
modules/base/manifests/init.pp » ('J')
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 node 'server4' { | 1 node 'server4' { |
| 2 include base, puppetmaster | 2 include puppetmaster |
| 3 | |
| 4 class {'nagios::client': | |
| 5 server_address => 'monitoring.adblockplus.org' | |
| 6 } | |
| 7 | 3 |
| 8 class {'nagios::server': | 4 class {'nagios::server': |
| 9 domain => 'monitoring.adblockplus.org', | 5 domain => 'monitoring.adblockplus.org', |
| 10 certificate => 'monitoring.adblockplus.org_sslcert.pem', | 6 certificate => 'monitoring.adblockplus.org_sslcert.pem', |
| 11 private_key => 'monitoring.adblockplus.org_sslcert.key', | 7 private_key => 'monitoring.adblockplus.org_sslcert.key', |
| 12 is_default => 'true', | 8 is_default => 'true', |
| 13 htpasswd_source => 'puppet:///modules/private/nagios-htpasswd', | 9 htpasswd_source => 'puppet:///modules/private/nagios-htpasswd', |
| 14 admins => ['*'] | 10 admins => ['*'] |
| 15 } | 11 } |
| 16 | 12 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 check_command => 'check_nrpe_1arg!check_connections', | 168 check_command => 'check_nrpe_1arg!check_connections', |
| 173 } | 169 } |
| 174 | 170 |
| 175 nagios_service {'memory': | 171 nagios_service {'memory': |
| 176 use => 'generic-service', | 172 use => 'generic-service', |
| 177 hostgroup_name => 'all', | 173 hostgroup_name => 'all', |
| 178 service_description => 'Memory', | 174 service_description => 'Memory', |
| 179 check_command => 'check_nrpe_1arg!check_memory', | 175 check_command => 'check_nrpe_1arg!check_memory', |
| 180 } | 176 } |
| 181 } | 177 } |
| OLD | NEW |
« hiera/puppet-node-classifier.rb ('K')
|
« manifests/issuesserver.pp ('k')
|
manifests/nodes.pp » ('j')
|
modules/base/manifests/init.pp » ('J')
