Export PATH in drupal script

diff --git a/files/drupal b/files/drupal
index 948ed432c5591b6f1149fa82ce19645a4661cfb1..b2587fbddd8734c8b7ba7f55b057860954719797 100755 (executable)
--- a/files/drupal
+++ b/files/drupal
@@ -7,6 +7,9 @@ BASE=${BASE:="/var/www/data"}
 SITES=${SITES:="$BASE/drupal"}
 SERIES="5 6 7"
 
+# Ensure we have a proper path, useful when called through cron
+export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+
 # Read a parameter from user
 function drupal_user_input {
   local input

diff --git a/manifests/init.pp b/manifests/init.pp
index f250fe9028f309088449021512c89197173a5d08..34a4fb117087d8093c0565a795d149b4e259508e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -39,7 +39,6 @@ class drupal(
     user     => root,
     hour     => "*/1",
     minute   => "15",
-    path     => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     ensure   => present,
     require  => File['/usr/local/sbin/drupal'],
   }
@@ -52,7 +51,6 @@ class drupal(
     weekday  => 5,
     hour     => "02",
     minute   => "30",
-    path     => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     ensure   => present,
   }
 
@@ -63,7 +61,6 @@ class drupal(
     weekday  => 4,
     hour     => "02",
     minute   => "30",
-    path     => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     ensure   => present,
     require  => File['/usr/local/sbin/drupal',
                      '/usr/local/share/drupal/drupal6.make',
@@ -77,7 +74,6 @@ class drupal(
     weekday  => 4,
     hour     => "02",
     minute   => "30",
-    path     => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
     ensure   => present,
     require  => File['/usr/local/sbin/drupal',
                      '/usr/local/share/drupal/drupal7.make',