Skip to content

Commit

Permalink
Remove the conditional that limits the use of the code to EL7
Browse files Browse the repository at this point in the history
  • Loading branch information
Thai Pham committed Jul 18, 2017
1 parent b74b2d6 commit c1cd9d2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 22 deletions.
13 changes: 8 additions & 5 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
group => 'systemd-journal',
}

file { '/etc/systemd/journald.conf':
ensure => 'file',
owner => 0,
group => 0,
content => template("${module_name}/journald.conf.erb"),
$defaults = {
'path' => '/etc/systemd/journald.conf',
'notify' => Service['systemd-journald'],
}

$ini_settings = {
'Journal' => $merged_options,
}
create_ini_settings($ini_settings, $defaults)
}
16 changes: 8 additions & 8 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# === Parameters:
#
# $persist_log:: By default, the journal stores log data in /run/log/journal/.
# $persist_log:: By default, the journal stores log data in /run/log/journal/.
# Since /run/ is volatile, log data is lost at reboot. To make the
# data persistent, it is sufficient to create /var/log/journal/
# 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
Expand All @@ -18,11 +18,11 @@
$enable_defaults = $journald::params::enable_defaults,
$options = {},
) inherits journald::params {
if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '7.0') >= 0 {
contain ::journald::config
contain ::journald::service

Class['journald::config'] ~>
Class['journald::service']
}
contain ::journald::config
contain ::journald::service

Class['journald::config'] ~>
Class['journald::service']

}
9 changes: 0 additions & 9 deletions templates/journald.conf.erb

This file was deleted.

0 comments on commit c1cd9d2

Please sign in to comment.