Skip to content

Commit cd229a2

Browse files
committed
add parameter to set different rsyslog.conf template, fixes #269 #266
1 parent 1fc0c70 commit cd229a2

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

REFERENCE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ The following parameters are available in the `rsyslog` class:
5555
* [`rsyslog_d`](#-rsyslog--rsyslog_d)
5656
* [`purge_rsyslog_d`](#-rsyslog--purge_rsyslog_d)
5757
* [`rsyslog_conf`](#-rsyslog--rsyslog_conf)
58+
* [`rsyslog_conf_template_file`](#-rsyslog--rsyslog_conf_template_file)
5859
* [`rsyslog_default`](#-rsyslog--rsyslog_default)
5960
* [`rsyslog_default_file`](#-rsyslog--rsyslog_default_file)
6061
* [`run_user`](#-rsyslog--run_user)
@@ -158,6 +159,14 @@ Path to rsyslog main configuration file
158159

159160
Default value: `$rsyslog::params::rsyslog_conf`
160161

162+
##### <a name="-rsyslog--rsyslog_conf_template_file"></a>`rsyslog_conf_template_file`
163+
164+
Data type: `String[1]`
165+
166+
Name of the rsyslog.conf template file to use
167+
168+
Default value: `"${module_name}/rsyslog.conf.erb"`
169+
161170
##### <a name="-rsyslog--rsyslog_default"></a>`rsyslog_default`
162171

163172
Data type: `Stdlib::Absolutepath`

manifests/config.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
file { $rsyslog::rsyslog_conf:
2424
ensure => file,
25-
content => template("${module_name}/rsyslog.conf.erb"),
25+
content => template($rsyslog::rsyslog_conf_template_file),
2626
}
2727

2828
file { $rsyslog::rsyslog_default:

manifests/init.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
# @param rsyslog_conf
3333
# Path to rsyslog main configuration file
3434
#
35+
# @param rsyslog_conf_template_file
36+
# Name of the rsyslog.conf template file to use
37+
#
3538
# @param rsyslog_default
3639
# rsyslog default file path
3740
#
@@ -132,6 +135,7 @@
132135
Stdlib::Absolutepath $rsyslog_d = $rsyslog::params::rsyslog_d,
133136
Boolean $purge_rsyslog_d = $rsyslog::params::purge_rsyslog_d,
134137
Stdlib::Absolutepath $rsyslog_conf = $rsyslog::params::rsyslog_conf,
138+
String[1] $rsyslog_conf_template_file = "${module_name}/rsyslog.conf.erb",
135139
Stdlib::Absolutepath $rsyslog_default = $rsyslog::params::rsyslog_default,
136140
String[1] $rsyslog_default_file = $rsyslog::params::default_config_file,
137141
String[1] $run_user = $rsyslog::params::run_user,

0 commit comments

Comments
 (0)