diff --git a/default.config.yml b/default.config.yml index 759c2f573..bc49b8b34 100644 --- a/default.config.yml +++ b/default.config.yml @@ -171,6 +171,7 @@ installed_extras: - adminer # - blackfire - drupalconsole + # - drush - mailhog # - memcached # - newrelic @@ -202,6 +203,7 @@ ruby_install_gems: [] extra_security_enabled: false drush_version: "master" +drush_path: "/var/www/drupalvm/vendor/drush/drush/drush" drush_keep_updated: true drush_composer_cli_options: "--prefer-dist --no-interaction" diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml index df50ee94c..a1a463c0f 100644 --- a/provisioning/playbook.yml +++ b/provisioning/playbook.yml @@ -50,10 +50,10 @@ - geerlingguy.php-pecl - geerlingguy.php-mysql - geerlingguy.composer - - geerlingguy.drush # Conditionally-installed roles. - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' } + - { role: geerlingguy.drush, when: '"drush" in installed_extras' } - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' } - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' } - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' } diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2 index cc9249bf6..1fff6d7be 100644 --- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 +++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2 @@ -14,6 +14,9 @@ $aliases['{{ host }}'] = array( 'remote-host' => '{{ host }}', 'remote-user' => '{{ vagrant_user }}', 'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key', + 'path-aliases' => array( + '%drush-script' => '{{ drush_path }}', + ), ); {% endif -%}