2 files changed, 6 insertions, 6 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
deleted file mode 100644
index 4dd03203..00000000
--- a/puppet/manifests/setup.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# this is applied before each run of site.pp
-#
-
-include ::site_config::setup
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 57942d99..912234ac 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,5 +1,10 @@
 # set a default exec path
-Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
+# the logoutput exec parameter defaults to "on_error" in puppet 3,
+# but to "false" in puppet 2.7, so we need to set this globally here
+Exec {
+    logoutput => on_failure,
+      path    => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin'
+}
 
 include site_config::setup
 include site_config::default