diff --git a/manifests/config.pp b/manifests/config.pp index c07fcdc..2420b00 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,5 +1,9 @@ class journald::config { - $merged_options = merge($::journald::params::default_options, $::journald::options) + if $::journald::enable_defaults { + $merged_options = merge($::journald::params::default_options, $::journald::options) + } else { + $merged_options = $::journald::options + } if $::journald::persist_log { $journald_dir = 'directory' diff --git a/manifests/init.pp b/manifests/init.pp index 6783873..4c8944f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -9,10 +9,13 @@ # data persistent, it is sufficient to create /var/log/journal/ # where systemd-journald will then store the data. # +# $enable_defaults:: if defaults parameters should be used or not +# # $options:: a hash with journald parameters # class journald ( $persist_log = $journald::params::persist_log, + $enable_defaults = $journald::params::enable_defaults, $options = undef ) inherits journald::params { if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '7.0') >= 0 { diff --git a/manifests/params.pp b/manifests/params.pp index 4cf07e8..1b32fdd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,5 +1,6 @@ class journald::params { $persist_log = true + $enable_defaults = false $default_options = { 'Storage' => 'auto', 'Compress' => 'yes', diff --git a/metadata.json b/metadata.json index b1eb664..8d7a922 100644 --- a/metadata.json +++ b/metadata.json @@ -1,7 +1,7 @@ { "name": "cristifalcas-journald", "author": "Cristian Falcas", - "version": "0.3.0", + "version": "0.4.0", "source": "git@github.com:cristifalcas/puppet-journald.git", "project_page": "https://github.com/cristifalcas/puppet-journald", "issues_url": "https://github.com/cristifalcas/puppet-journald/issues",