From eeef391f8e52b0d64e132c3cf0deb786358dcb2f Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Tue, 26 Dec 2023 15:19:34 -0800 Subject: [PATCH] Fix drupal10-nginx tests. --- builders/_drupaly.js | 1 - examples/drupal10-nginx/README.md | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/builders/_drupaly.js b/builders/_drupaly.js index 0bf1d44..878082a 100644 --- a/builders/_drupaly.js +++ b/builders/_drupaly.js @@ -250,7 +250,6 @@ module.exports = { if (_.startsWith(options.via, 'nginx')) options.proxyService = 'appserver_nginx'; else if (_.startsWith(options.via, 'apache')) options.proxyService = 'appserver'; } - console.log(`${options.app}.${options._app._config.domain}`); options.proxy = _.set(options.proxy, options.proxyService, [`${options.app}.${options._app._config.domain}`]); // Send downstream diff --git a/examples/drupal10-nginx/README.md b/examples/drupal10-nginx/README.md index b8b63a3..65fc965 100644 --- a/examples/drupal10-nginx/README.md +++ b/examples/drupal10-nginx/README.md @@ -32,16 +32,16 @@ Run the following commands to validate things are rolling as they should. ```bash # Should return the drupal installation page by default cd nginx -lando ssh -s appserver_nginx -c "curl -L localhost" | grep "Drupal 10" +lando ssh -s appserver -c "curl -L appserver_nginx" | grep "Drupal 10" # Should use 8.1 as the default php version cd nginx lando php -v | grep "PHP 8.1" -# Should be running nginx 1.17 by default +# Should be running nginx 1.25 by default cd nginx -lando ssh -s appserver_nginx -c "nginx -v 2>&1 | grep 1.17" -lando ssh -s appserver_nginx -c "curl -IL localhost" | grep Server | grep nginx +lando ssh -s appserver_nginx -c "nginx -v 2>&1 | grep 1.25" +lando ssh -s appserver -c "curl -IL appserver_nginx" | grep Server | grep nginx # Should be running mysql 5.7 by default cd nginx