Skip to content

Tweaks to enable us to support rhel9 #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Tweaks to enable us to support rhel9 #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be8044d
Added rsyslog_default_use_caller_module to enable pulling templates from
MiggyMan May 20, 2025
42b1089
Debug
MiggyMan May 20, 2025
6a6ad08
Tweak
MiggyMan May 20, 2025
fad0a40
Cake
MiggyMan May 20, 2025
005d1bd
Dumbass
MiggyMan May 20, 2025
e6cbb10
Cake
MiggyMan May 20, 2025
546e824
Clean up
MiggyMan May 20, 2025
0af510d
Tidy
MiggyMan May 20, 2025
00ecde3
Correction
MiggyMan May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
# @param rsyslog_default_file
# `rsyslog_d` file template to use
#
# @param rsyslog_default_file_absolute_path
# `rsyslog_d` Use rsyslog_default_file as the absolute template path
#
# @param run_user
# Which user rsyslog should run as
#
Expand Down Expand Up @@ -150,6 +153,7 @@
String[1] $rsyslog_conf_template_file = "${module_name}/rsyslog.conf.erb",
Stdlib::Absolutepath $rsyslog_default = $rsyslog::params::rsyslog_default,
String[1] $rsyslog_default_file = $rsyslog::params::default_config_file,
Boolean $rsyslog_default_file_absolute_path = false,
String[1] $run_user = $rsyslog::params::run_user,
String[1] $run_group = $rsyslog::params::run_group,
String[1] $log_user = $rsyslog::params::log_user,
Expand Down Expand Up @@ -208,13 +212,24 @@
require => File[$rsyslog_d],
}

file { $rsyslog_default:
ensure => file,
owner => 'root',
group => $run_group,
content => template("${module_name}/${rsyslog_default_file}.erb"),
notify => Service[$service_name],
require => File[$rsyslog_conf],
if($rsyslog_default_file_absolute_path == false ) {
file { $rsyslog_default:
ensure => file,
owner => 'root',
group => $run_group,
content => template("${rsyslog_default_file}.erb"),
notify => Service[$service_name],
require => File[$rsyslog_conf],
}
} else {
file { $rsyslog_default:
ensure => file,
owner => 'root',
group => $run_group,
content => template("${module_name}/${rsyslog_default_file}.erb"),
notify => Service[$service_name],
require => File[$rsyslog_conf],
}
}

file { $spool_dir:
Expand Down
2 changes: 1 addition & 1 deletion templates/client/remote.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<% else -%>
<% dropaction = '' -%>
<% end -%>
<%= pattern %> to <%= host %> via <%= server['protocol'].downcase %> on <%= port %> using <%=format_type %> format.
# Sending logs that match <%= pattern %> to <%= host %> via <%= server['protocol'].downcase %> on <%= port %> using <%=format_type %> format.
<%= pattern %> <%= protocol %><%= host %>:<%= port %><%= format %>
<%= dropaction %>
<% end -%>
Expand Down