diff --git a/files/deploy.ini b/files/deploy.ini new file mode 100644 index 0000000..4186487 --- /dev/null +++ b/files/deploy.ini @@ -0,0 +1,2 @@ +error_log="" +display_errors="stderr" diff --git a/manifests/init.pp b/manifests/init.pp index 1bacdf1..89818d3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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', + } } diff --git a/templates/sushi_script.erb b/templates/sushi_script.erb index 78f1cf4..3b7e45a 100644 --- a/templates/sushi_script.erb +++ b/templates/sushi_script.erb @@ -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" "$@"