Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing dependencies for sysklogd #124

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Removing dependencies for sysklogd #124

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a1a070
Moving require to sysklogd with EL5 specific
jehane Jan 17, 2019
be630f8
Removing dependencies
jehane Jan 17, 2019
0ddc02b
Update metadata.json
jehane Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@
$default_syslogd_options = '-m 0'
$default_mod_imjournal = false
$default_manage_devlog = false
}
# ensures that sysklogd is absent, which is needed on EL5
require '::sysklogd'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 - this should only be applied to EL5 and not other platforms

}
/^6\.*/: {
$default_pid_file = '/var/run/syslogd.pid'
$sysconfig_erb = 'sysconfig.rhel6.erb'
Expand All @@ -206,8 +208,6 @@
fail("rsyslog supports RedHat like systems with major release of 5, 6 and 7 and you have ${::operatingsystemrelease}")
}
}
# ensures that sysklogd is absent, which is needed on EL5
require '::sysklogd'
}
'Debian': {
$default_logrotate_present = true
Expand Down