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

Send errors to stderr when sake is run via sushi #7

Merged
merged 1 commit into from
Nov 26, 2020
Merged

Send errors to stderr when sake is run via sushi #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions files/deploy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
error_log=""
display_errors="stderr"
8 changes: 8 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,12 @@
group => 'root',
mode => '0700',
}

file { "${cli_root}/deploy.ini":
ensure => present,
owner => $cli_owner,
group => $cli_group,
source => 'puppet:///modules/ss_sushi/deploy.ini',
mode => '0644',
}
}
2 changes: 1 addition & 1 deletion templates/sushi_script.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ fi
chmod +x "$SAKE_PATH"

# Preserves env
sudo -E -u www-data "$SAKE_PATH" "$@"
sudo -E -u www-data PHP_INI_SCAN_DIR=:<%= @cli_root %> "$SAKE_PATH" "$@"
brettt89 marked this conversation as resolved.
Show resolved Hide resolved