aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-12-16 09:41:03 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-12-16 09:41:03 -0200
commitb371c43c3ea02d449d22f6cbc36ea48a06ae1e41 (patch)
treef89ab36b61d0c4c6ceef5f39bd9cc00f30c0c10d
parent26ed898b68199649575848c00a07eae49510fbb6 (diff)
downloadpuppet-drupal-b371c43c3ea02d449d22f6cbc36ea48a06ae1e41.tar.gz
puppet-drupal-b371c43c3ea02d449d22f6cbc36ea48a06ae1e41.tar.bz2
Export PATH in drupal script
-rwxr-xr-xfiles/drupal3
-rw-r--r--manifests/init.pp4
2 files changed, 3 insertions, 4 deletions
diff --git a/files/drupal b/files/drupal
index 948ed43..b2587fb 100755
--- 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 f250fe9..34a4fb1 100644
--- 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',