diff --git a/files/common.sh b/files/common.sh index 8af0b0f..a448fb9 100644 --- a/files/common.sh +++ b/files/common.sh @@ -7,7 +7,7 @@ fail() { # Print a stderr: entry if there were anything printed to stderr if [[ -s $_tmp ]]; then # Hack to try and output valid json by replacing newlines with spaces. - echo "{ \"status\": \"error\", \"message\": \"$1\", \"stderr\": \"$(tr '\n' ' ' <$_tmp)\" }" + echo "{ \"status\": \"error\", \"message\": \"$1\", \"stderr\": \"$(tr '\n' ' ' <$_tmp)\" }" else echo "{ \"status\": \"error\", \"message\": \"$1\" }" fi diff --git a/manifests/backup.pp b/manifests/backup.pp index 7beee66..3417190 100644 --- a/manifests/backup.pp +++ b/manifests/backup.pp @@ -56,7 +56,7 @@ # Reset the crontab for pe-postgres if the (databases backed up by default every day) change. exec { 'reset_pe-postgres_crontab': - path => '/usr/local/bin/:/bin/', + path => '/usr/local/bin/:/bin/:/usr/bin', command => 'crontab -r -u pe-postgres', onlyif => 'crontab -l -u pe-postgres', refreshonly => true, diff --git a/tasks/reset_pgrepack_schema.sh b/tasks/reset_pgrepack_schema.sh index 84eb0bf..85b96db 100644 --- a/tasks/reset_pgrepack_schema.sh +++ b/tasks/reset_pgrepack_schema.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Puppet Task Name: reset_pgrepack_schema declare PT__installdir