modules/web/manifests/server.pp - Issue 29326028: Issue 2999 - Integrate web::server SSL parameters with Hiera

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: modules/web/manifests/server.pp

Issue 29326028: Issue 2999 - Integrate web::server SSL parameters with Hiera (Closed)

Patch Set: Issue 2999 - Recognize HTTP/S when dealing with host aliases Created Sept. 7, 2015, 1:21 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: modules/web/manifests/server.pp

diff --git a/modules/web/manifests/server.pp b/modules/web/manifests/server.pp

index df6b92d03b9d60d66b16766552ea0d310a9ed28c..b56264d75f8b17ee441a9b88aa6ebb6c396a4a17 100644

--- a/modules/web/manifests/server.pp

+++ b/modules/web/manifests/server.pp

@@ -1,8 +1,8 @@

class web::server(

$vhost,

$repository,

- $certificate,

- $private_key,

+ $certificate = hiera('web::server::certificate', 'undef'),

+ $private_key = hiera('web::server::private_key', 'undef'),

$is_default = false,

$aliases = undef,

$custom_config = undef,

@@ -25,8 +25,8 @@ class web::server(

content => template('web/site.conf.erb'),

global_config => template('web/global.conf.erb'),

is_default => $is_default,

- certificate => $certificate,

- private_key => $private_key,

+ certificate => $certificate ? {'undef' => undef, default => $certificate},

+ private_key => $private_key ? {'undef' => undef, default => $private_key},

log => "access_log_$vhost"

}

« no previous file with comments | « no previous file | modules/web/templates/global.conf.erb » ('j') | no next file with comments »