fix default for default params. Fix template for empty options

cristifalcas · May 19, 2017 · b74b2d6 · b74b2d6
1 parent e84f629
commit b74b2d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -16,7 +16,7 @@
 class journald (
   $persist_log = $journald::params::persist_log,
   $enable_defaults =  $journald::params::enable_defaults,
-  $options = undef
+  $options = {},
 ) inherits journald::params {
   if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '7.0') >= 0 {
     contain ::journald::config

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,6 +1,6 @@
 class journald::params {
   $persist_log = true
-  $enable_defaults = false
+  $enable_defaults = true
   $default_options = {
     'Storage'           => 'auto',
     'Compress'          => 'yes',

diff --git a/metadata.json b/metadata.json
@@ -1,7 +1,7 @@
 {
 	"name": "cristifalcas-journald",
 	"author": "Cristian Falcas",
-	"version": "0.4.0",
+	"version": "0.5.0",
 	"source": "[email protected]:cristifalcas/puppet-journald.git",
 	"project_page": "https://github.com/cristifalcas/puppet-journald",
 	"issues_url": "https://github.com/cristifalcas/puppet-journald/issues",

diff --git a/templates/journald.conf.erb b/templates/journald.conf.erb
@@ -2,7 +2,7 @@
 # See journald.conf(5) for details
 
 [Journal]
-<%- scope.lookupvar('journald::config::merged_options').sort.each do |k, v| -%>
+<%- scope['journald::config::merged_options'].sort.each do |k, v| -%>
 <%- if v != :undef -%>
 <%= k %>=<%= v %>
 <%- end -%>