#231: xdebug all teh linux

lando · Jul 29, 2017 · 9d6264b · 9d6264b
1 parent 843b51e
commit 9d6264b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/docs/changelog/2017.md b/docs/changelog/2017.md
@@ -5,6 +5,8 @@ v3.0.0-alpha.20 - [July 30, 2017](https://github.com/kalabox/lando/releases/tag/
 *   Added option to rebuild specific services on a `lando rebuild` [#223](https://github.com/kalabox/lando/issues/223)
 *   Improved cli feedback for unknown commands [#162](https://github.com/kalabox/lando/issues/162)
 *   Fixed regresion causing custom `extra_hosts` not to load [#222](https://github.com/kalabox/lando/issues/222)
+*   Fixed proxy `extra_hosts` not working on `linux` [#221](https://github.com/kalabox/lando/issues/221)
+*   Fixed `xdebug` not working on `linux` [#231](https://github.com/kalabox/lando/issues/231)
 
 v3.0.0-alpha.19 - [July 29, 2017](https://github.com/kalabox/lando/releases/tag/v3.0.0-alpha.19)
 -------------------------------

diff --git a/plugins/lando-services/php/php.js b/plugins/lando-services/php/php.js
@@ -134,10 +134,17 @@ module.exports = function(lando) {
     // Add in our xdebug config
     if (config.xdebug) {
 
+      // Linux uses this apparently?
+      // @TODO: this cant possibly be consistent
+      var remoteIp = lando.config.env.LANDO_ENGINE_REMOTE_IP;
+      if (process.platform === 'linux') {
+        remoteIp = '192.168.0.1';
+      }
+
       // Conf
       var xconfig = [
         'remote_enable=true',
-        'remote_host=' + lando.config.env.LANDO_ENGINE_REMOTE_IP
+        'remote_host=' + remoteIp
       ];
 
       // Add the conf