opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #332 from kimor79/master

Browse source 
Allow format_log in ssl vhosts as well
This commit is contained in:
James Fryman 2014-06-11 12:29:59 -05:00
commit 70e772ed40
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
manifests/resource/vhost.pp
View file

@ -379,7 +379,7 @@ define nginx::resource::vhost (
$access_log_real = $format_log ? {
undef => $access_log_tmp,
default => "${access_log_tmp} $format_log",
default => "${access_log_tmp} ${format_log}",
}
$error_log_real = $error_log ? {
@ -480,11 +480,21 @@ define nginx::resource::vhost (
# Create SSL File Stubs if SSL is enabled
if ($ssl == true) {
# Access and error logs are named differently in ssl template
$ssl_access_log = $access_log ? {
# This was a lot to add up in parameter list so add it down here
# Also opted to add more logic here and keep template cleaner which
# unfortunately means resorting to the $varname_real thing
$ssl_access_log_tmp = $access_log ? {
undef => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.access.log",
default => $access_log,
}
$ssl_error_log = $error_log ? {
$ssl_access_log_real = $format_log ? {
undef => $ssl_access_log_tmp,
default => "${ssl_access_log_tmp} ${format_log}",
}
$ssl_error_log_real = $error_log ? {
undef => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.error.log",
default => $error_log,
}

4
templates/vhost/vhost_ssl_header.erb
View file

@ -48,8 +48,8 @@ server {
index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
<% end -%>
access_log <%= @ssl_access_log %>;
error_log <%= @ssl_error_log %>;
access_log <%= @ssl_access_log_real %>;
error_log <%= @ssl_error_log_real %>;
<% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>