Skip to content

Commit

Permalink
#231: Consolidate xdebug remote host logic to piggyback off remote en…
Browse files Browse the repository at this point in the history
…gine host discovery
  • Loading branch information
pirog committed Aug 2, 2017
1 parent 8afbaae commit 7b370d6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
8 changes: 6 additions & 2 deletions plugins/lando-recipes/pantheon/pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ if [ "$DATABASE" != "none" ]; then
eval "$PULL_DB"

else
echo "No drush alias detected for $SITE.$ENV. Please make sure you have full access to this site."
echo "No drush alias detected for @pantheon.$SITE.$ENV. Please make sure you have full access to this site."
echo "You can verify this by running lando terminus aliases && lando drush sa | grep MYSITE"
echo "If your site is not listed try the manual import instructions:"
echo "See: https://docs.lndo.io/tutorials/pantheon.html"
exit 1
fi

Expand All @@ -102,7 +105,8 @@ if [ "$DATABASE" != "none" ]; then
# if [ "$FRAMEWORK" == "wordpress" ]; then
# wp search-replace '$ENV-$SITE.pantheon.io' '$LANDO_APP_NAME.lndo.site'
# fi
echo "WordPress database pull not currently supported. See: https://docs.lndo.io/tutorials/pantheon.html for manual db import steps."
echo "WordPress database pull not currently supported."
echo "See: https://docs.lndo.io/tutorials/pantheon.html for manual db import steps."
fi

fi
Expand Down
9 changes: 1 addition & 8 deletions plugins/lando-services/php/php.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,10 @@ 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=' + remoteIp
'remote_host=' + lando.config.env.LANDO_ENGINE_REMOTE_IP
];

// Add the conf
Expand Down

0 comments on commit 7b370d6

Please sign in to comment.