Use newer syslog-ng configuration, simpler include mechanism.

.gitattributes

@@ -0,0 +1,2 @@
+templates/** text eol=lf
+files/** text eol=lf

README.md

@@ -1,7 +1,20 @@
 Description
 ===========
 
-The Syslog NG cookbook installs and configures syslog-ng service.
+The Syslog NG cookbook installs and configures syslog-ng service. There are two recipes
+
+* syslog-ng enables syslog-ng but does not affect your current syslog configuration
+* syslog-ng::global disables your existing syslog and configures syslog-ng to handle system logging
+
+There are also four definitions
+
+* syslog_ng_source configures syslog-ng to listen on a udp port
+* syslog_ng_filter configures a filter
+* syslog_ng_file configures syslog-ng to write logs it receives to a file
+* syslog_ng_forwarder configures syslog-ng to forward logs it receives to another syslog server
+
+The path to logfiles is generated by concatenating log_base, the application name, and log_name. When setting log_base and log_name you can use syslog-ng macros. For example, log_name could be "${YEAR}/${MONTH}/${DAY}/${HOUR}.log"
+
 The cookbook has been written for and tested on CentOS with syslog-ng 2.1.4.
 Syslog NG can be obtained [here: balabit.com](http://www.balabit.com/downloads/files?path=/syslog-ng/sources/2.1.4). 
 
@@ -22,11 +35,32 @@ Usage
 ### In a cookbook:
     include_recipe "syslog-ng"
 
-    syslog_ng_app application[:name] do
+    syslog_ng_source "source_foo" do
       index "02"
       host "127.0.0.1"
       port "514"
+    end
+
+    syslog_ng_file "application_foo" do
+      index "03"
+      source_name "source_foo"
+      days_uncompressed "7"
       log_base "/var/applogs"
+      log_name "default.log"
+    end
+
+    syslog_ng_filter "warnings" do
+      index  "04"
+      filter "level(warning)"
+    end
+
+    syslog_ng_forwarder "application_foo_warnings" do
+      index "05"
+      source_name "source_foo"
+      filter_name "warnings"
+      destination_host "example.com"
+      destination_port "514"
+      destination_protocol "udp"
     end
 
 
@@ -52,6 +86,23 @@ limitations under the License.
 Changes
 =======
 
+### v 1.3.0
+
+* Create filter definition and have file and forwarder optionally take a filter
+
+### v 1.2.0
+
+* Break source out into its own definition
+
+### v 1.1.0
+
+* adding a new definition for configuring forwarding
+* renaming the defintion that writes files to make that clearer in the name
+* in the definition for writing files, allow specifying file name
+* in the definition for writing files, compress old log files
+* moving system logging configuration from the default recipe to a new recipe
+
+
 ### v 1.0.0
 
 * Initial public release

attributes/default.rb

@@ -1,4 +1,17 @@
-default[:syslog_ng][:user]          = "root"
-default[:syslog_ng][:group]         = "root"
-default[:syslog_ng][:log_dir]       = "/var/log/syslog-ng"
-default[:syslog_ng][:config_dir]    = "/etc/syslog-ng"
+default[:syslog_ng][:user]            = "root"
+default[:syslog_ng][:group]           = "root"
+default[:syslog_ng][:log_dir]         = "/var/log/syslog-ng"
+default[:syslog_ng][:config_dir]      = "/etc/syslog-ng"
+default[:syslog_ng][:flush_lines]            = 0
+default[:syslog_ng][:time_reopen]     = 10
+default[:syslog_ng][:log_fifo_size]   = 1000
+default[:syslog_ng][:chain_hostnames]  = 'off'
+default[:syslog_ng][:use_dns]         = 'no'
+default[:syslog_ng][:use_fqdn]        = 'no'
+default[:syslog_ng][:create_dirs]     = 'yes'
+default[:syslog_ng][:keep_hostname]   = 'yes'
+default[:syslog_ng][:chain_hostnames] = 'yes'
+default[:syslog_ng][:global_opts] = []
+default[:syslog_ng][:source_prefix] = 's_udp_'
+default[:syslog_ng][:syslog_ng_config_name] = 'syslog-ng.conf'
+default[:syslog_ng][:syslog_ng_version] = '3.5'

definitions/generate_syslog_ng_conf_if_missing.rb

@@ -0,0 +1,40 @@
+#
+# Cookbook Name:: syslog-ng
+# Definition:: generate_syslog_ng_conf_if_missing
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :generate_syslog_ng_conf_if_missing, :template => "syslog-ng.conf.erb" do
+  include_recipe "syslog-ng"
+
+  current_time = Time.now.utc
+  syslog_ng_version = node[:syslog_ng][:syslog_ng_version]
+  filepath = "#{node[:syslog_ng][:config_dir]}/#{node[:cloudhouse_syslog][:syslog_ng_config_name]}"
+
+  template filepath do
+    action :create_if_missing
+    source params[:template]
+    owner node[:syslog_ng][:user]
+    group node[:syslog_ng][:group]
+    mode 00640
+
+    variables(
+      :current_time => current_time,
+      :syslog_ng_version => syslog_ng_version
+    )
+
+    notifies :restart, resources(:service => "syslog-ng"), :immediately
+  end
+
+end

definitions/syslog_ng_file.rb

@@ -0,0 +1,82 @@
+#
+# Cookbook Name:: syslog-ng
+# Definition:: syslog_ng_file
+#
+# Copyright 2012, Artem Veremey
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :syslog_ng_file, :template => "syslog_ng_file.erb" do
+  include_recipe "syslog-ng"
+
+
+  application = {
+    :name => params[:name],
+    :index => params[:index] || "02",
+    :cookbook => params[:cookbook] || "syslog-ng",
+    :source_name => params[:source_name],
+    :source_prefix => params[:source_prefix] || node[:syslog_ng][:source_prefix],
+    :days_uncompressed => params[:days_uncompressed] || 1,
+    :log_base => params[:log_base] || node[:syslog_ng][:log_dir],
+    :log_name => params[:log_name] || "default.log",
+  }
+
+  # filter_name is optional
+  if params[:filter_name]
+    application[:filter_name] = params[:filter_name]
+  end 
+
+  directory "#{application[:log_base]}" do
+    owner node[:syslog_ng][:user]
+    group node[:syslog_ng][:group]
+    mode 00755
+    action :create
+  end
+
+  directory "#{application[:log_base]}/#{application[:name]}" do
+    owner node[:syslog_ng][:user]
+    group node[:syslog_ng][:group]
+    mode 00755
+    action :create
+  end
+
+  template "#{node[:syslog_ng][:config_dir]}/conf.d/#{application[:index]}#{application[:name]}" do
+    source params[:template]
+    owner node[:syslog_ng][:user]
+    group node[:syslog_ng][:group]
+    mode 00640
+    cookbook application[:cookbook]
+
+    if params[:cookbook]
+      cookbook params[:cookbook]
+    end
+
+    variables(
+      :application => application,
+      :params => params
+    )
+
+    notifies :restart, resources(:service => "syslog-ng"), :immediately
+  end
+
+  template "/etc/cron.daily/#{application[:name]}_compress_logs" do
+    source "compress_logs.erb"
+    cookbook application[:cookbook]
+    mode 0755
+    owner "root"
+    group "root"
+    variables( :application => application )
+  end
+
+end

definitions/syslog_ng_filter.rb

@@ -0,0 +1,50 @@
+#
+# Cookbook Name:: syslog-ng
+# Definition:: syslog_ng_file
+#
+# Copyright 2012, Artem Veremey
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :syslog_ng_filter, :template => "syslog_ng_filter.erb" do
+  include_recipe "syslog-ng"
+
+
+  application = {
+    :name => params[:name],
+    :index => params[:index] || "02",
+    :cookbook => params[:cookbook] || "syslog-ng",
+    :filter => params[:filter],
+  }
+
+  template "#{node[:syslog_ng][:config_dir]}/conf.d/#{application[:index]}#{application[:name]}" do
+    source params[:template]
+    owner node[:syslog_ng][:user]
+    group node[:syslog_ng][:group]
+    mode 00640
+    cookbook application[:cookbook]
+
+    if params[:cookbook]
+      cookbook params[:cookbook]
+    end
+
+    variables(
+      :application => application,
+      :params => params
+    )
+
+    notifies :restart, resources(:service => "syslog-ng"), :immediately
+  end
+
+end

definitions/syslog_ng_forwarder.rb

@@ -0,0 +1,57 @@
+#
+# Cookbook Name:: syslog-ng
+# Definition:: syslog_ng_forwarder
+#
+# Copyright 2012, Artem Veremey
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :syslog_ng_forwarder, :template => "syslog_ng_forwarder.erb" do
+  include_recipe "syslog-ng"
+
+  application = {
+    :name => params[:name],
+    :index => params[:index] || "02",
+    :cookbook => params[:cookbook] || "syslog-ng",
+    :source_name => params[:source_name],
+    :source_prefix => params[:source_prefix] || node[:syslog_ng][:source_prefix],
+    :destination_host => params[:destination_host],
+    :destination_port => params[:destination_port] || "514",
+    :destination_protocol => params[:destination_protocol] || "udp",
+  }
+
+  # filter_name is optional
+  if params[:filter_name]
+    application[:filter_name] = params[:filter_name]
+  end
+
+  template "#{node[:syslog_ng][:config_dir]}/conf.d/#{application[:index]}#{application[:name]}" do
+    source params[:template]
+    owner node[:syslog_ng][:user]
+    group node[:syslog_ng][:group]
+    mode 00640
+    cookbook application[:cookbook]
+
+    if params[:cookbook]
+      cookbook params[:cookbook]
+    end
+
+    variables(
+      :application => application,
+      :params => params
+    )
+
+    notifies :restart, resources(:service => "syslog-ng"), :immediately
+  end
+end