From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 15 Dec 2015 14:25:53 +0000 (-0200)
Subject: Updates drush installation
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=38637073c829c0c718927da53f87986ccbc8aa19;p=puppet-drupal.git

Updates drush installation
---

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',
   }