From 5c60058fc3b5331fba2e96f0064835ef80e9a5b5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 10 Apr 2017 16:37:55 -0500
Subject: [PATCH 1/2] Fixes #1355: Make Drush alias for 'local' work in VM
 guest or host by default.

---
 scripts/drupal-vm/drupal-vm.aliases.drushrc.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/drupal-vm/drupal-vm.aliases.drushrc.php b/scripts/drupal-vm/drupal-vm.aliases.drushrc.php
index dd807f1b9..79bad1ce6 100644
--- a/scripts/drupal-vm/drupal-vm.aliases.drushrc.php
+++ b/scripts/drupal-vm/drupal-vm.aliases.drushrc.php
@@ -1,11 +1,16 @@
 // [vagrant_machine_name].local
 $aliases['${project.machine_name}.local'] = array(
-  // /var/www/[vagrant_machine_name]/docroot
+  // /var/www/${project.machine_name}/docroot
   'root' => '/var/www/${project.machine_name}/docroot',
   // vagrant_hostname
   'uri' => '${project.local.uri}',
-  // vagrant_hostname
-  'remote-host' => '${project.local.hostname}',
-  'remote-user' => 'vagrant',
-  'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key'
-);
+  );
+// Add connection options if alias is used outside VM.
+if ('vagrant' != $_SERVER['USER']) {
+  $aliases['${project.machine_name}.local'] += array(
+    // vagrant_hostname
+    'remote-host' => '${project.local.hostname}',
+    'remote-user' => 'vagrant',
+    'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key'
+  );
+}

From 46fdafb791f2065491709c11c25bcbd03e47c958 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 11 Apr 2017 09:32:46 -0500
Subject: [PATCH 2/2] Issue #1355: Clean up comments in Drupal VM aliases file.

---
 scripts/drupal-vm/drupal-vm.aliases.drushrc.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/drupal-vm/drupal-vm.aliases.drushrc.php b/scripts/drupal-vm/drupal-vm.aliases.drushrc.php
index 79bad1ce6..81fe787ec 100644
--- a/scripts/drupal-vm/drupal-vm.aliases.drushrc.php
+++ b/scripts/drupal-vm/drupal-vm.aliases.drushrc.php
@@ -1,14 +1,11 @@
-// [vagrant_machine_name].local
+// Local environment.
 $aliases['${project.machine_name}.local'] = array(
-  // /var/www/${project.machine_name}/docroot
   'root' => '/var/www/${project.machine_name}/docroot',
-  // vagrant_hostname
   'uri' => '${project.local.uri}',
   );
-// Add connection options if alias is used outside VM.
+// Add remote connection options when alias is used outside VM.
 if ('vagrant' != $_SERVER['USER']) {
   $aliases['${project.machine_name}.local'] += array(
-    // vagrant_hostname
     'remote-host' => '${project.local.hostname}',
     'remote-user' => 'vagrant',
     'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key'