Fix path in backup.pp and reset pgrepack schema task

Author: Daniel Carabas

files/common.sh

@@ -7,16 +7,16 @@ 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)\" }"
+    $(/usr/bin/which echo) "{ \"status\": \"error\", \"message\": \"$1\", \"stderr\": \"$(tr '\n' ' ' <$_tmp)\" }"
   else
-    echo "{ \"status\": \"error\", \"message\": \"$1\" }"
+    $(/usr/bin/which echo) "{ \"status\": \"error\", \"message\": \"$1\" }"
   fi
 
   exit ${2:-1}
 }
 
 success() {
-  echo "$1"
+  $(/usr/bin/which echo) "$1"
   exit 0
 }
 

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,

tasks/reset_pgrepack_schema.sh

@@ -1,12 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Puppet Task Name: reset_pgrepack_schema
 declare PT__installdir
 # shellcheck disable=SC1090
 source "$PT__installdir/pe_databases/files/common.sh"
 
 #Determine if PE Postgres is available
-if puppet resource service pe-postgresql | grep -q running; then
+if puppet resource service pe-postgresql | $(/usr/bin/which grep) -q running; then
     #Remove the pg_repack extension
     su - pe-postgres -s '/bin/bash' -c '/opt/puppetlabs/server/bin/psql -d pe-puppetdb -c "DROP EXTENSION pg_repack CASCADE"' || fail "unable to drop pg_repack extension"