aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-12-15 12:25:53 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-12-15 12:25:53 -0200
commit38637073c829c0c718927da53f87986ccbc8aa19 (patch)
tree3ec96f3eb82946962a46305410d8672fb3ccf343 /manifests
parent5222e7a4f3fbb35affaae46ee74c8a561e8f5ba3 (diff)
downloadpuppet-drupal-38637073c829c0c718927da53f87986ccbc8aa19.tar.gz
puppet-drupal-38637073c829c0c718927da53f87986ccbc8aa19.tar.bz2
Updates drush installation
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp10
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 81c69c9..b5bb4cc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,8 @@
class drupal(
- $folder = hiera('drupal::folder', '/var/www/data/drupal'),
- $sites_folder = hiera('drupal::sites_folder', '/var/sites'),
- $www_folder = hiera('drupal::www_folder', '/var/www/data')
+ $folder = hiera('drupal::folder', '/var/www/data/drupal'),
+ $sites_folder = hiera('drupal::sites_folder', '/var/sites'),
+ $www_folder = hiera('drupal::www_folder', '/var/www/data'),
+ $drush_version = hiera('drupal::drush::version', '8.0.1')
) {
# Needed packages
package { [ "php5-gd", "php5-imagick" ]:
@@ -184,9 +185,10 @@ class drupal(
#}
exec { 'getdrush':
- command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush',
+ command => "/usr/bin/wget https://github.com/drush-ops/drush/releases/download/${drush_version}/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush",
user => 'root',
cwd => '/tmp',
+ timeout => 0,
creates => '/usr/local/bin/drush',
}