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

Unified Diff: modules/web/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/updateserver/manifests/init.pp ('k') | modules/web/templates/global.conf.erb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/web/manifests/server.pp
===================================================================
--- a/modules/web/manifests/server.pp
+++ b/modules/web/manifests/server.pp
@@ -1,11 +1,13 @@
class web::server(
$vhost,
$repository,
+ $certificate,
+ $private_key,
$is_default = false,
$aliases = undef,
$custom_config = undef,
$multiplexer_locations = undef) {
File {
owner => 'root',
group => 'root',
mode => 0644,
@@ -18,18 +20,18 @@ class web::server(
include nginx
package {['python-jinja2', 'python-markdown']:}
nginx::hostconfig {$vhost:
content => template('web/site.conf.erb'),
global_config => template('web/global.conf.erb'),
is_default => $is_default,
- certificate => 'adblockplus.org_sslcert.pem',
- private_key => 'adblockplus.org_sslcert.key',
+ certificate => $certificate,
+ private_key => $private_key,
log => "access_log_$vhost"
}
class {'sitescripts':
sitescriptsini_source => 'puppet:///modules/web/sitescripts',
}
if $multiplexer_locations != undef {
« no previous file with comments | « modules/updateserver/manifests/init.pp ('k') | modules/web/templates/global.conf.erb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld