Commit 5388c8b8 authored by jtimberman's avatar jtimberman
Browse files

Merge branch 'COOK-2357'

parents f1be0df4 a1d635d8
......@@ -20,7 +20,7 @@
default["rsyslog"]["log_dir"] = "/srv/rsyslog"
default["rsyslog"]["server"] = false
default["rsyslog"]["protocol"] = "tcp"
default["rsyslog"]["port"] = "514"
default["rsyslog"]["port"] = 514
default["rsyslog"]["server_ip"] = nil
default["rsyslog"]["server_search"] = "role:loghost"
default["rsyslog"]["remote_logs"] = true
......@@ -33,7 +33,6 @@ default["rsyslog"]["service_name"] = "rsyslog"
default["rsyslog"]["user"] = "root"
default["rsyslog"]["group"] = "adm"
default["rsyslog"]["priv_seperation"] = false
default["rsyslog"]["defaults_file"] = "/etc/default/rsyslog"
case node["platform"]
when "ubuntu"
......@@ -43,8 +42,6 @@ when "ubuntu"
default["rsyslog"]["group"] = "adm"
default["rsyslog"]["priv_seperation"] = true
end
when "redhat"
default["rsyslog"]["defaults_file"] = "/etc/sysconfig/rsyslog"
when "arch"
default["rsyslog"]["service_name"] = "rsyslogd"
end
# Generated by Chef
#
# Use v3 native mode, rather than compatibility mode by specifying -c3
# here. Compatibility mode for older versions is not recommended as
# custom configuration may get messy.
#
# See rsyslogd(8) for more details
RSYSLOGD_OPTIONS="-c3"
# Options for rsyslogd
# Syslogd options are deprecated since rsyslog v3.
# If you want to use them, switch to compatibility mode 2 by "-c 2"
# See rsyslogd(8) for more details
SYSLOGD_OPTIONS="-c 5"
# Generated by Chef
#
# Options for rsyslogd
# -m 0 disables 'MARK' messages (deprecated, only used in compat mode < 3)
# -r enables logging from remote machines (deprecated, only used in compat mode < 3)
# -x disables DNS lookups on messages received with -r
# -c compatibility mode
# See rsyslogd(8) for more details
RSYSLOGD_OPTIONS="-c4"
# Generated by Chef
#
# Options for rsyslogd
# -m 0 disables 'MARK' messages (deprecated, only used in compat mode < 3)
# -r enables logging from remote machines (deprecated, only used in compat mode < 3)
# -x disables DNS lookups on messages received with -r
# -c compatibility mode
# See rsyslogd(8) for more details
RSYSLOGD_OPTIONS="-c4"
......@@ -10,7 +10,7 @@ recipe "rsyslog", "Installs rsyslog"
recipe "rsyslog::client", "Sets up a client to log to a remote rsyslog server"
recipe "rsyslog::server", "Sets up an rsyslog server"
supports "ubuntu", ">= 10.04"
supports "ubuntu"
supports "debian", ">= 5.0"
supports "redhat", ">= 6.0"
......@@ -68,11 +68,6 @@ attribute "rsyslog/service_name",
:description => "The name of the service for the platform",
:default => "rsyslog"
attribute "rsyslog/defaults_file",
:display_name => "Defaults file",
:description => "The full path to the service's defaults/sysconfig file",
:default => "/etc/default/rsyslog"
attribute "rsyslog/max_message_size",
:display_name => "Maximum Rsyslog message size",
:description => "Specifies the maximum size of allowable Rsyslog messages",
......
......@@ -21,13 +21,6 @@ package "rsyslog" do
action :install
end
cookbook_file "#{node["rsyslog"]["defaults_file"]}" do
source "rsyslog.default"
owner node['rsyslog']['user']
group node['rsyslog']['group']
mode 0644
end
directory "/etc/rsyslog.d" do
owner node['rsyslog']['user']
group node['rsyslog']['group']
......@@ -60,7 +53,7 @@ template "/etc/rsyslog.d/50-default.conf" do
notifies :restart, "service[#{node['rsyslog']['service_name']}]"
end
service "#{node['rsyslog']['service_name']}" do
service node['rsyslog']['service_name'] do
supports :restart => true, :reload => true, :status => true
action [:enable, :start]
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment