Commit c810fd83 authored by Tim Smith's avatar Tim Smith Committed by jtimberman
Browse files

Remove management of the defaults files

parent ff6b9afe
...@@ -33,7 +33,6 @@ default["rsyslog"]["service_name"] = "rsyslog" ...@@ -33,7 +33,6 @@ default["rsyslog"]["service_name"] = "rsyslog"
default["rsyslog"]["user"] = "root" default["rsyslog"]["user"] = "root"
default["rsyslog"]["group"] = "adm" default["rsyslog"]["group"] = "adm"
default["rsyslog"]["priv_seperation"] = false default["rsyslog"]["priv_seperation"] = false
default["rsyslog"]["defaults_file"] = "/etc/default/rsyslog"
case node["platform"] case node["platform"]
when "ubuntu" when "ubuntu"
...@@ -43,8 +42,6 @@ when "ubuntu" ...@@ -43,8 +42,6 @@ when "ubuntu"
default["rsyslog"]["group"] = "adm" default["rsyslog"]["group"] = "adm"
default["rsyslog"]["priv_seperation"] = true default["rsyslog"]["priv_seperation"] = true
end end
when "redhat"
default["rsyslog"]["defaults_file"] = "/etc/sysconfig/rsyslog"
when "arch" when "arch"
default["rsyslog"]["service_name"] = "rsyslogd" default["rsyslog"]["service_name"] = "rsyslogd"
end 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"
...@@ -68,11 +68,6 @@ attribute "rsyslog/service_name", ...@@ -68,11 +68,6 @@ attribute "rsyslog/service_name",
:description => "The name of the service for the platform", :description => "The name of the service for the platform",
:default => "rsyslog" :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", attribute "rsyslog/max_message_size",
:display_name => "Maximum Rsyslog message size", :display_name => "Maximum Rsyslog message size",
:description => "Specifies the maximum size of allowable Rsyslog messages", :description => "Specifies the maximum size of allowable Rsyslog messages",
......
...@@ -21,13 +21,6 @@ package "rsyslog" do ...@@ -21,13 +21,6 @@ package "rsyslog" do
action :install action :install
end 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 directory "/etc/rsyslog.d" do
owner node['rsyslog']['user'] owner node['rsyslog']['user']
group node['rsyslog']['group'] group node['rsyslog']['group']
......
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