Future: composer and drush packages

diff --git a/manifests/init.pp b/manifests/init.pp
index 63ed0625e85a10b204011f828f93df90171506af..0ea8b9376e8cc297a91b807eb23b6fea3a794623 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,11 +3,6 @@ class drupal(
   $sites_folder = hiera('drupal::sites_folder', '/var/sites'),
   $www_folder   = hiera('drupal::www_folder',   '/var/www/data')
 ) {
-  # We use drupal source from upstream 
-  package { [ "drupal6", "drush" ]:
-    ensure => absent,
-  }
-
   # Needed packages
   package { [ "php5-gd", "php5-imagick" ]:
     ensure => installed,
@@ -159,6 +154,11 @@ class drupal(
     creates => '/usr/local/bin/composer',
   }
 
+  # TODO: future
+  #package { [ 'composer', 'drush' ]:
+  #  ensure  => present,
+  #}
+
   #vcsrepo { "/usr/local/share/drush":
   #  ensure   => present,
   #  provider => git,