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

Support specifying log formats

Browse source
This commit is contained in:
Joshua B. Bussdieker 2014-08-02 00:04:43 -07:00 committed by Matthew Haughton
parent b9743d3826
commit 2e221a7e0f
4 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/config.pp
View file

@ -57,6 +57,7 @@ class nginx::config(
$http_tcp_nodelay = 'on', $http_tcp_nodelay = 'on',
$http_tcp_nopush = 'off', $http_tcp_nopush = 'off',
$keepalive_timeout = '65', $keepalive_timeout = '65',
$log_format = {},
$mail = false, $mail = false,
$multi_accept = 'off', $multi_accept = 'off',
$names_hash_bucket_size = '64', $names_hash_bucket_size = '64',

3
manifests/init.pp
View file

@ -79,6 +79,7 @@ class nginx (
$global_group = undef, $global_group = undef,
$global_mode = undef, $global_mode = undef,
$logdir = undef, $logdir = undef,
$log_format = undef,
$http_access_log = undef, $http_access_log = undef,
$nginx_error_log = undef, $nginx_error_log = undef,
$pid = undef, $pid = undef,
@ -158,6 +159,7 @@ class nginx (
$http_tcp_nopush or $http_tcp_nopush or
$keepalive_timeout or $keepalive_timeout or
$logdir or $logdir or
$log_format or
$mail or $mail or
$multi_accept or $multi_accept or
$names_hash_bucket_size or $names_hash_bucket_size or
@ -237,6 +239,7 @@ class nginx (
http_tcp_nopush => $http_tcp_nopush, http_tcp_nopush => $http_tcp_nopush,
keepalive_timeout => $keepalive_timeout, keepalive_timeout => $keepalive_timeout,
log_dir => $logdir, log_dir => $logdir,
log_format => $log_format,
mail => $mail, mail => $mail,
multi_accept => $multi_accept, multi_accept => $multi_accept,
names_hash_bucket_size => $names_hash_bucket_size, names_hash_bucket_size => $names_hash_bucket_size,

12
spec/classes/config_spec.rb
View file

@ -177,6 +177,18 @@ describe 'nginx::config' do
:value => '100', :value => '100',
:match => ' worker_connections 100;', :match => ' worker_connections 100;',
}, },
{
:title => 'should set log formats',
:attr => 'log_format',
:value => {
'format1' => 'FORMAT1',
'format2' => 'FORMAT2',
},
:match => [
' log_format format1 \'FORMAT1\';',
' log_format format2 \'FORMAT2\';',
],
},
{ {
:title => 'should set access_log', :title => 'should set access_log',
:attr => 'http_access_log', :attr => 'http_access_log',

5
templates/conf.d/nginx.conf.erb
View file

@ -24,6 +24,11 @@ events {
http { http {
include <%= @conf_dir %>/mime.types; include <%= @conf_dir %>/mime.types;
default_type application/octet-stream; default_type application/octet-stream;
<% if @log_format -%>
<% @log_format.sort_by{|k,v| k}.each do |key,value| -%>
log_format <%= key %> '<%= value %>';
<% end -%>
<% end -%>
access_log <%= @http_access_log %>; access_log <%= @http_access_log %>;