From 638de05719f49dddb9631314572da903375bbe38 Mon Sep 17 00:00:00 2001 From: bishop Date: Tue, 5 Mar 2019 23:58:53 -0800 Subject: [PATCH 1/5] Fix default group and dir-group for RHEL-derived linux config --- CHANGELOG.md | 4 ++++ attributes/default.rb | 2 ++ metadata.rb | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b9f4376..62c4f69a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This file is used to list changes made in each version of the rsyslog cookbook. +## 6.0.8 (2019-03-05) + +- Fix default group and dir-group for RHEL-derived linux config + ## 6.0.7 (2018-08-01) - Optional creation of default configuration file 50-default.conf diff --git a/attributes/default.rb b/attributes/default.rb index 6ac3b499..31bbd36b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -115,6 +115,8 @@ } when 'rhel', 'fedora' default['rsyslog']['working_dir'] = '/var/lib/rsyslog' + default['rsyslog']['group'] = 'root' + default['rsyslog']['dir_group'] = 'root' # format { facility => destination } default['rsyslog']['default_facility_logs'] = { '*.info;mail.none;authpriv.none;cron.none' => "#{node['rsyslog']['default_log_dir']}/messages", diff --git a/metadata.rb b/metadata.rb index 25a1c15c..792272f3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache-2.0' description 'Installs and configures rsyslog' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '6.0.7' +version '6.0.8' recipe 'rsyslog', 'Sets up rsyslog for local logging' recipe 'rsyslog::client', 'Sets up a client to log to a remote rsyslog server' From 2b00acb83d9ff55455c046d801fb686a73f22e16 Mon Sep 17 00:00:00 2001 From: bishop Date: Thu, 7 Mar 2019 00:14:49 -0800 Subject: [PATCH 2/5] Enhance imfile template management --author "anonymous gdpr@example.com" --- CHANGELOG.md | 4 ++++ metadata.rb | 2 +- resources/file_input.rb | 16 +++++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c4f69a..321c0bb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This file is used to list changes made in each version of the rsyslog cookbook. +## 6.0.9 (2019-03-06) + +- Enhance imfile template management + ## 6.0.8 (2019-03-05) - Fix default group and dir-group for RHEL-derived linux config diff --git a/metadata.rb b/metadata.rb index 792272f3..b26d5f2f 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache-2.0' description 'Installs and configures rsyslog' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '6.0.8' +version '6.0.9' recipe 'rsyslog', 'Sets up rsyslog for local logging' recipe 'rsyslog::client', 'Sets up a client to log to a remote rsyslog server' diff --git a/resources/file_input.rb b/resources/file_input.rb index 9e14333a..31780174 100644 --- a/resources/file_input.rb +++ b/resources/file_input.rb @@ -24,7 +24,19 @@ property :template_source, String, default: 'file-input.conf.erb' action :create do - log_name = new_resource.name + create_template(:create) +end + +action :delete do + create_template(:delete) +end + +action_class do + def log_name + new_resource.name + end + + def create_template(create_action) template "/etc/rsyslog.d/#{new_resource.priority}-#{new_resource.name}.conf" do mode '0664' owner node['rsyslog']['user'] @@ -36,6 +48,7 @@ 'state_file' => log_name, 'severity' => new_resource.severity, 'facility' => new_resource.facility + action create_action notifies :restart, "service[#{node['rsyslog']['service_name']}]", :delayed end @@ -43,4 +56,5 @@ supports restart: true, status: true action [:enable, :start] end + end end From cc37eda9b5b96df511bb01fa4efe0e3b4c416cb1 Mon Sep 17 00:00:00 2001 From: bishop Date: Fri, 8 Mar 2019 23:40:52 -0800 Subject: [PATCH 3/5] 6.0.10 (2019-03-08) - Remove remote.conf when no more remote servers --- CHANGELOG.md | 4 ++++ metadata.rb | 2 +- recipes/client.rb | 37 ++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 321c0bb7..67bd8289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This file is used to list changes made in each version of the rsyslog cookbook. +## 6.0.10 (2019-03-08) + +- Remove remote.conf when no more remote servers + ## 6.0.9 (2019-03-06) - Enhance imfile template management diff --git a/metadata.rb b/metadata.rb index b26d5f2f..8764b088 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache-2.0' description 'Installs and configures rsyslog' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '6.0.9' +version '6.0.10' recipe 'rsyslog', 'Sets up rsyslog for local logging' recipe 'rsyslog::client', 'Sets up a client to log to a remote rsyslog server' diff --git a/recipes/client.rb b/recipes/client.rb index 5f99bac9..27f0a16f 100644 --- a/recipes/client.rb +++ b/recipes/client.rb @@ -49,22 +49,25 @@ if rsyslog_servers.empty? Chef::Log.warn('The rsyslog::client recipe was unable to determine the remote syslog server. Checked both the server_ip attribute and search! Not forwarding logs.') -else - remote_type = node['rsyslog']['use_relp'] ? 'relp' : 'remote' - template "#{node['rsyslog']['config_prefix']}/rsyslog.d/49-remote.conf" do - source "49-#{remote_type}.conf.erb" - owner node['rsyslog']['config_files']['owner'] - group node['rsyslog']['config_files']['group'] - mode node['rsyslog']['config_files']['mode'] - variables(servers: rsyslog_servers) - notifies :run, 'execute[validate_config]' - notifies :restart, "service[#{node['rsyslog']['service_name']}]" - only_if { node['rsyslog']['remote_logs'] } - end +end - file "#{node['rsyslog']['config_prefix']}/rsyslog.d/server.conf" do - action :delete - notifies :run, 'execute[validate_config]' - notifies :restart, "service[#{node['rsyslog']['service_name']}]" - end +# create or delete config as appropriate +remote_type = node['rsyslog']['use_relp'] ? 'relp' : 'remote' +template "#{node['rsyslog']['config_prefix']}/rsyslog.d/49-remote.conf" do + source "49-#{remote_type}.conf.erb" + owner node['rsyslog']['config_files']['owner'] + group node['rsyslog']['config_files']['group'] + mode node['rsyslog']['config_files']['mode'] + variables(servers: rsyslog_servers) + notifies :run, 'execute[validate_config]' + notifies :restart, "service[#{node['rsyslog']['service_name']}]" + only_if { node['rsyslog']['remote_logs'] } + action rsyslog_servers.empty? ? :delete : :create end + +file "#{node['rsyslog']['config_prefix']}/rsyslog.d/server.conf" do + action :delete + notifies :run, 'execute[validate_config]' + notifies :restart, "service[#{node['rsyslog']['service_name']}]" +end + From eb84c4b104a832ef08de40fcf58eb39dacd969d6 Mon Sep 17 00:00:00 2001 From: Bishop Clark Date: Tue, 17 Sep 2019 23:59:53 -0700 Subject: [PATCH 4/5] secretarial by-hand indentation --- resources/file_input.rb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/file_input.rb b/resources/file_input.rb index 31780174..c18fdacb 100644 --- a/resources/file_input.rb +++ b/resources/file_input.rb @@ -37,24 +37,24 @@ def log_name end def create_template(create_action) - template "/etc/rsyslog.d/#{new_resource.priority}-#{new_resource.name}.conf" do - mode '0664' - owner node['rsyslog']['user'] - group node['rsyslog']['group'] - source new_resource.template_source - cookbook new_resource.cookbook_source - variables 'file_name' => new_resource.file, - 'tag' => log_name, - 'state_file' => log_name, - 'severity' => new_resource.severity, - 'facility' => new_resource.facility - action create_action - notifies :restart, "service[#{node['rsyslog']['service_name']}]", :delayed - end + template "/etc/rsyslog.d/#{new_resource.priority}-#{new_resource.name}.conf" do + mode '0664' + owner node['rsyslog']['user'] + group node['rsyslog']['group'] + source new_resource.template_source + cookbook new_resource.cookbook_source + variables 'file_name' => new_resource.file, + 'tag' => log_name, + 'state_file' => log_name, + 'severity' => new_resource.severity, + 'facility' => new_resource.facility + action create_action + notifies :restart, "service[#{node['rsyslog']['service_name']}]", :delayed + end - service node['rsyslog']['service_name'] do - supports restart: true, status: true - action [:enable, :start] - end + service node['rsyslog']['service_name'] do + supports restart: true, status: true + action [:enable, :start] + end end end From e75f17b419907a70fae21b68bbf0f3f814c777d4 Mon Sep 17 00:00:00 2001 From: Jason Field <4923914+Xorima@users.noreply.github.com> Date: Mon, 23 Nov 2020 17:55:00 +0000 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0870e6af..4c2325e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,6 @@ This file is used to list changes made in each version of the rsyslog cookbook. - Add an attribute for setting the mode on the configuration directory - ## 7.1.0 (2020-10-26) ### Changed