Forces the configuration of the apt::ppa repository before the
installation of packages, so they will be installed in their correct
version.
Pull Request (PR) description
puppet-lint flagged these lines
<!--
Thank you for contributing to this project!
-->
Pull Request (PR) description
<!--
Replace this comment with a description of your pull request.
-->
This Pull Request (PR) fixes the following issues
<!--
Replace this comment with the list of issues or n/a.
Use format:
Fixes #123
Fixes #124
-->
<!--
Thank you for contributing to this project!
-->
Pull Request (PR) description
Setup rsyslog so that if any $featurepackages are given rsyslog will
restart after those $featurepackages are installed.
Forcing a restart of rsyslog after installation of any $featurepackages
are installed is important if you have an rsyslog config that is not
valid without the additional package from $featurepackages in place.
<!--
Thank you for contributing to this project!
-->
Pull Request (PR) description
According to the doc (https://www.rsyslog.com/doc/v8-stable/configuration/modules/omrelp.html) omrelp tls permitted peers can be given as an array.
example:
tls.permittedPeer=["SHA1:...1", "SHA1:....2"]
This PR reuse the same logic present in inputs.epp for to deal with arrays.
This Pull Request (PR) fixes the following issues
Following puppet declaration :
```
class { 'rsyslog::config':
modules => {
'omrelp' => {},
},
actions => {
relp => {
type => 'omrelp',
config => {
target => 'logs.example.tld',
port => '2514',
tls => 'on',
'tls.mycert' => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
'tls.myprivkey' =>'/etc/ssl/private/ssl-cert-snakeoil.key',
'tls.authmode' => 'fingerprint',
'tls.permittedpeer' =>['rsyslog_permittedpeers'],
}
},
}
```
produce the following rsyslog config :
```
module(load="omrelp")
relp
action(type="omrelp"
name="relp"
target="logs.example.tld"
port="2514"
tls="on"
tls.mycert="/etc/ssl/certs/ssl-cert-snakeoil.pem"
tls.myprivkey="/etc/ssl/private/ssl-cert-snakeoil.key"
tls.authmode="fingerprint"
tls.permittedpeer="[ 'rsyslog_permittedpeers' ]"
)
```
with the fix i have
...
tls.permittedpeer=[ "rsyslog_permittedpeers" ]
...
… resource
<!--
Thank you for contributing to this project!
-->
Pull Request (PR) description
<!--
Replace this comment with a description of your pull request.
-->
This Pull Request (PR) fixes the following issues
<!--
Replace this comment with the list of issues or n/a.
Use format:
Fixes #123
Fixes #124
-->
<!--
Thank you for contributing to this project!
-->
Pull Request (PR) description
<!--
Replace this comment with a description of your pull request.
-->
Fixes this kind of error:
```
Syntax error at 'global_config' (file: /etc/puppetlabs/code/environments/rsyslog/site/profile/manifests/rsyslog.pp, line: 5, column: 5)
1 # Class: profile::rsyslog
2 # By default provides client configuration, can optionally provide server configuration
3 class profile::rsyslog {
4 class { 'rsyslog::config':
5 'global_config' => {}
[...]
```
Also in this commit a minor typofix in REFERENCE.
Affected Puppet, Ruby, OS and module versions/distributions
- Puppet: puppet-agent-7.33.0-1.el7.x86_64
- Distribution: Red Hat Enterprise Linux Server release 7.9 (Maipo)
- Module version: Commit 40440a8
What are you seeing
The module incorrectly assumes that the include() object is supported on rsyslog without first checking (or providing an override) for an appropriate version of rsyslog.
What behaviour did you expect instead
This module uses the new syntax of include() instead of the older $IncludeConfig. The include() syntax is supported only on rsyslog > 8.33.0.
Output log
```
syslogd[39175]: action 'include' treated as ':omusrmsg:include' - please use ':omusrmsg:include' syntax instead, 'include' will not be supported in the future [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2184 ]
syslogd[39175]: error during parsing file /etc/rsyslog.conf, on or before line 5: warnings occured in file '/etc/rsyslog.conf' around line 5 [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2207 ]
syslogd[39175]: error during parsing file /etc/rsyslog.conf, on or before line 5: invalid character '(' - is there an invalid escape sequence somewhere? [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2207 ]
syslogd[39175]: action 'file' treated as ':omusrmsg:file' - please use ':omusrmsg:file' syntax instead, 'file' will not be supported in the future [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2184 ]
syslogd[39175]: error during parsing file /etc/rsyslog.conf, on or before line 5: warnings occured in file '/etc/rsyslog.conf' around line 5 [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2207 ]
syslogd[39175]: error during parsing file /etc/rsyslog.conf, on or before line 5: invalid character '=' - is there an invalid escape sequence somewhere? [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2207 ]
syslogd[39175]: error during parsing file /etc/rsyslog.conf, on or before line 5: invalid character '"' - is there an invalid escape sequence somewhere? [v8.24.0-57.el79.3 try http://www.rsyslog.com/e/2207 ]
syslogd[39175]: invalid character in selector line - ';template' expected [v8.24.0-57.el79.3]
syslogd[39175]: error during parsing file /etc/rsyslog.conf, on or before line 5: errors occured in file '/etc/rsyslog.conf' around line 5 [v8.24.0-57.el7_9.3 try http://www.rsyslog.com/e/2207 ]
```
Any additional information you'd like to impart
The module should do one of the following:
- check for the version of rsyslog RPM that's currently installed
- provide a way to override the (current) default syntax of include().
- leverage hiera data to grab the major os version of the operating system and apply appropriate "include" directives.
The latest version of rsyslog available for RHEL7 is rsyslog-8.24.0-57.el79.3.x8664.rpm.
@m8t
