From 9dffb7314d6a8a5f5155640156ed81982e32c268 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 21 Apr 2015 13:41:25 +0200 Subject: removed leftover puppet/manifests/setup.pp, it's not used anymore Change-Id: Ib64c9a9d15eb6f276e7928e47e96cd44291583c9 --- puppet/manifests/setup.pp | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 puppet/manifests/setup.pp (limited to 'puppet/manifests') 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 -- cgit v1.2.3 From caa62d845bbc54737aa40931c0b2eca068592dd9 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 26 Apr 2015 11:13:28 +0200 Subject: Exec[] should log the output of the command on failure #6851 Change-Id: If99ae4036f9210516762f5cd7eb66744661a9665 --- puppet/manifests/site.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'puppet/manifests') 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 -- cgit v1.2.3