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

Unified 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.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/filterserver/manifests/init.pp ('k') | modules/notificationserver/manifests/init.pp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/nagios/manifests/server.pp
===================================================================
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,27 +1,35 @@
-class nagios::server($domain, $is_default=false, $htpasswd_source, $admins) {
+class nagios::server(
+ $domain,
+ $certificate,
+ $private_key,
+ $is_default=false,
+ $htpasswd_source,
+ $admins
+ ) {
+
File {
owner => 'root',
group => 'root',
mode => 0644
}
include nginx, 'spawn-fcgi'
package {['nagios3', 'nagios3-doc', 'nagios-nrpe-plugin', 'php5-cgi',
'fcgiwrap', 'pnp4nagios']:
ensure => present
}
nginx::hostconfig{$domain:
source => 'puppet:///modules/nagios/site.conf',
is_default => $is_default,
- certificate => 'adblockplus.org_sslcert.pem',
- private_key => 'adblockplus.org_sslcert.key',
+ certificate => $certificate,
+ private_key => $private_key,
log => 'access_log_monitoring'
}
spawn-fcgi::php-pool {'global':
ensure => present,
socket => '/tmp/php-fastcgi.sock',
children => '3'
}
« 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