From 9c41f88f26458e661bfdd71e90ee24f9d74b7b2c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 23 Nov 2015 14:44:39 -0200
Subject: Change drush install strategy

---
 manifests/init.pp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index a2318c8..78e3fcb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -168,20 +168,20 @@ class drupal(
     creates => '/usr/local/bin/composer',
   }
 
-  file { "/usr/local/bin/drush":
-    ensure  => '/usr/local/share/drush/drush',
-    owner   => root,
-    group   => root,
-    require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ],
-  }
-
-  #exec { 'getdrush':
-  #  command => '/usr/bin/wget https://github.com/drush-ops/drush/releases/download/8.0.0-rc3/drush.phar -O /usr/local/bin/drush && chmod +x /usr/local/bin/drush',
-  #  user    => 'root',
-  #  cwd     => '/tmp',
-  #  creates => '/usr/local/bin/drush',
+  #file { "/usr/local/bin/drush":
+  #  ensure  => '/usr/local/share/drush/drush',
+  #  owner   => root,
+  #  group   => root,
+  #  require => [ Vcsrepo['/usr/local/share/drush'], Exec['getcomposer'] ],
   #}
 
+  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',
+    user    => 'root',
+    cwd     => '/tmp',
+    creates => '/usr/local/bin/drush',
+  }
+
   #exec { 'composer-drush':
   #  command     => '/usr/local/bin/composer global require drush/drush:dev-master',
   #  user        => 'vagrant',
-- 
cgit v1.2.3