Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/nagios/manifests/server.pp

Issue 4894914248704000: Issue 254 - Switch from wildcard certificate to certificates for individual hosts (Closed)
Patch Set: Created April 10, 2014, 9 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/filterserver/manifests/init.pp ('k') | modules/notificationserver/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class nagios::server($domain, $is_default=false, $htpasswd_source, $admins) { 1 class nagios::server(
2 $domain,
3 $certificate,
4 $private_key,
5 $is_default=false,
6 $htpasswd_source,
7 $admins
8 ) {
9
2 File { 10 File {
3 owner => 'root', 11 owner => 'root',
4 group => 'root', 12 group => 'root',
5 mode => 0644 13 mode => 0644
6 } 14 }
7 15
8 include nginx, 'spawn-fcgi' 16 include nginx, 'spawn-fcgi'
9 17
10 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi', 18 package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi',
11 'fcgiwrap', 'pnp4nagios']: 19 'fcgiwrap', 'pnp4nagios']:
12 ensure => present 20 ensure => present
13 } 21 }
14 22
15 nginx::hostconfig{$domain: 23 nginx::hostconfig{$domain:
16 source => 'puppet:///modules/nagios/site.conf', 24 source => 'puppet:///modules/nagios/site.conf',
17 is_default => $is_default, 25 is_default => $is_default,
18 certificate => 'adblockplus.org_sslcert.pem', 26 certificate => $certificate,
19 private_key => 'adblockplus.org_sslcert.key', 27 private_key => $private_key,
20 log => 'access_log_monitoring' 28 log => 'access_log_monitoring'
21 } 29 }
22 30
23 spawn-fcgi::php-pool {'global': 31 spawn-fcgi::php-pool {'global':
24 ensure => present, 32 ensure => present,
25 socket => '/tmp/php-fastcgi.sock', 33 socket => '/tmp/php-fastcgi.sock',
26 children => '3' 34 children => '3'
27 } 35 }
28 36
29 service {'nagios3': 37 service {'nagios3':
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 file {['/etc/nagios3/conf.d/contacts.cfg', 137 file {['/etc/nagios3/conf.d/contacts.cfg',
130 '/etc/nagios3/conf.d/contactgroups.cfg', 138 '/etc/nagios3/conf.d/contactgroups.cfg',
131 '/etc/nagios3/conf.d/commands.cfg', 139 '/etc/nagios3/conf.d/commands.cfg',
132 '/etc/nagios3/conf.d/hosts.cfg', 140 '/etc/nagios3/conf.d/hosts.cfg',
133 '/etc/nagios3/conf.d/hostgroups.cfg', 141 '/etc/nagios3/conf.d/hostgroups.cfg',
134 '/etc/nagios3/conf.d/services.cfg']: 142 '/etc/nagios3/conf.d/services.cfg']:
135 require => Package['nagios3'], 143 require => Package['nagios3'],
136 notify => Service['nagios3'] 144 notify => Service['nagios3']
137 } 145 }
138 } 146 }
OLDNEW
« no previous file with comments | « modules/filterserver/manifests/init.pp ('k') | modules/notificationserver/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld