Skip to content

Commit a3fb939

Browse files
committed
merge modload class into init
1 parent cd229a2 commit a3fb939

File tree

4 files changed

+6
-47
lines changed

4 files changed

+6
-47
lines changed

REFERENCE.md

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
You propably want rsyslog::client or rsyslog::server
1313
* [`rsyslog::client`](#rsyslog--client): This class manages rsyslog as client
1414
* [`rsyslog::database`](#rsyslog--database): This class manages rsyslog database connection
15-
* [`rsyslog::modload`](#rsyslog--modload): This class manages extra rsyslog modules
1615
* [`rsyslog::params`](#rsyslog--params): Manages default configuration values for this module.
1716
* [`rsyslog::server`](#rsyslog--server): This class manages rsyslog as server
1817
* [`rsyslog::service`](#rsyslog--service): == Class: rsyslog::service This class enforces running of the rsyslog service. === Parameters === Variables === Examples class { 'rsysl
@@ -725,32 +724,6 @@ Data type: `Variant[String[1], Sensitive[String[1]]]`
725724

726725
The database password to use.
727726

728-
### <a name="rsyslog--modload"></a>`rsyslog::modload`
729-
730-
This class manages extra rsyslog modules
731-
732-
#### Examples
733-
734-
##### Puppet usage
735-
736-
```puppet
737-
class { 'rsyslog::modload': }
738-
```
739-
740-
#### Parameters
741-
742-
The following parameters are available in the `rsyslog::modload` class:
743-
744-
* [`modload_filename`](#-rsyslog--modload--modload_filename)
745-
746-
##### <a name="-rsyslog--modload--modload_filename"></a>`modload_filename`
747-
748-
Data type: `String[1]`
749-
750-
Snippet filename to use
751-
752-
Default value: `'10-modload'`
753-
754727
### <a name="rsyslog--params"></a>`rsyslog::params`
755728

756729
Manages default configuration values for this module.

manifests/init.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,11 @@
172172
contain rsyslog::service
173173

174174
if $extra_modules != [] {
175-
include rsyslog::modload
175+
rsyslog::snippet { '10-modload':
176+
ensure => present,
177+
content => template("${module_name}/modload.erb"),
178+
require => Class['rsyslog::install'],
179+
}
176180
}
177181

178182
Class['rsyslog::install'] -> Class['rsyslog::config'] ~> Class['rsyslog::service']

manifests/modload.pp

Lines changed: 0 additions & 18 deletions
This file was deleted.

templates/modload.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<% scope.lookupvar('rsyslog::extra_modules').each do |mod| -%>
1+
<% @extra_modules.each do |mod| -%>
22
$ModLoad <%= mod %>
33
<% end -%>

0 commit comments

Comments
 (0)