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

When absolute path is specified for access_log_file/error_log_file, don't prepend logbase #1633

Merged
merged 2 commits into from Jul 10, 2017
Merged

When absolute path is specified for access_log_file/error_log_file, don't prepend logbase #1633

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef8e8a
When absolute path is specified for access_log_file/error_log_file, d…
ca-asm Jun 13, 2017
7ec6aba
Update vhost.pp
tphoney Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions manifests/vhost.pp
View file
Open in desktop
Expand Up @@ -392,7 +392,12 @@

if $access_log and !$access_logs {
if $access_log_file {
$_logs_dest = "${logroot}/${access_log_file}"
if $access_log_file =~ /^\// {
# Absolute path provided - don't prepend $logroot
$_logs_dest = $access_log_file
} else {
$_logs_dest = "${logroot}/${access_log_file}"
}
} elsif $access_log_pipe {
$_logs_dest = $access_log_pipe
} elsif $access_log_syslog {
Expand All @@ -415,7 +420,12 @@
}

if $error_log_file {
$error_log_destination = "${logroot}/${error_log_file}"
if $error_log_file =~ /^\// {
# Absolute path provided - don't prepend $logroot
$error_log_destination = $error_log_file
} else {
$error_log_destination = "${logroot}/${error_log_file}"
}
} elsif $error_log_pipe {
$error_log_destination = $error_log_pipe
} elsif $error_log_syslog {
Expand Down