aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 63ed062..0ea8b93 100644
--- 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,