Merge pull request #7 from silverstripeltd/feat/inline-errors

Send errors to stderr when sake is run via sushi
silverstripeltd · Nov 26, 2020 · 82a5d4a · 82a5d4a
2 parents f5133c0 + 050ad4c
commit 82a5d4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/files/deploy.ini b/files/deploy.ini
@@ -0,0 +1,2 @@
+error_log=""
+display_errors="stderr"
diff --git 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
@@ -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" "$@"