diff --git a/CHANGELOG.md b/CHANGELOG.md index 97f6065..ddbb9a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## v1.2.0 - [February 23, 2024](https://github.com/lando/drupal/releases/tag/v1.2.0) + +### Fixes + +* Fixed `CRITICAL` issue with default config files not loading correctly + +### Internal + +* Updated to `@lando/php@1.2.0` +* Config tests. + ## v1.1.0 - [February 20, 2024](https://github.com/lando/drupal/releases/tag/v1.1.0) * Included ability to specify `database: mssql` in the `config` section to maintain backwards compatibility. [@lando/mssql#31](https://github.com/lando/mssql/issues/31) diff --git a/config/drupal10/default.conf.tpl b/config/drupal10/default.conf.tpl index 49ed496..d4e001d 100644 --- a/config/drupal10/default.conf.tpl +++ b/config/drupal10/default.conf.tpl @@ -1,3 +1,5 @@ +# LANDODRUPALNGINXCONF + server { listen 80 default_server; listen 443 ssl; diff --git a/config/drupal10/mysql.cnf b/config/drupal10/mysql.cnf index d85e082..b8b6190 100644 --- a/config/drupal10/mysql.cnf +++ b/config/drupal10/mysql.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQLCNF [mysqld] # @@ -71,7 +72,7 @@ max_binlog_size = 100M #innodb_buffer_pool_size = 384M #innodb_additional_mem_pool_size = 20M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 100M +innodb_log_file_size = 101M #innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 0 #innodb_lock_wait_timeout = 50 @@ -82,7 +83,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 121 # # * Security Features # diff --git a/config/drupal10/mysql8.cnf b/config/drupal10/mysql8.cnf index de0fd89..e616c5a 100644 --- a/config/drupal10/mysql8.cnf +++ b/config/drupal10/mysql8.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQL8CNF [mysqld] # @@ -49,7 +50,7 @@ read_buffer_size = 2M #server-id = 1 #log_bin = /src/.lando/log/mysql-bin.log expire_logs_days = 10 -max_binlog_size = 100M +max_binlog_size = 101M #binlog_do_db = include_database_name #binlog_ignore_db = include_database_name # @@ -77,7 +78,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 127 # # * Security Features # diff --git a/config/drupal10/php.ini b/config/drupal10/php.ini index a33dacf..6d6a378 100644 --- a/config/drupal10/php.ini +++ b/config/drupal10/php.ini @@ -1,5 +1,6 @@ [PHP] +; LANDODRUPALPHPINI ;;;;;;;;;;;;;;; ; PHP Globals ; ;;;;;;;;;;;;;;; @@ -36,8 +37,8 @@ xdebug.mode = ${XDEBUG_MODE} ; Globals expose_php = on -max_execution_time = 90 -max_input_time = 900 +max_execution_time = 91 +max_input_time = 901 max_input_vars = 10000 memory_limit = ${PHP_MEMORY_LIMIT} upload_max_filesize = 100M diff --git a/config/drupal6/default.conf.tpl b/config/drupal6/default.conf.tpl index da3f2ac..18ce512 100644 --- a/config/drupal6/default.conf.tpl +++ b/config/drupal6/default.conf.tpl @@ -1,3 +1,5 @@ +# LANDODRUPALNGINXCONF + server { listen 80 default_server; listen 443 ssl; @@ -57,8 +59,8 @@ server { } location / { - try_files $uri @rewrite; # For Drupal <= 6 - # try_files $uri /index.php?$query_string; # For Drupal >= 7 + # try_files $uri @rewrite; # For Drupal <= 6 + try_files $uri /index.php?$query_string; # For Drupal >= 7 } location @rewrite { @@ -103,16 +105,16 @@ server { } # Fighting with Styles? This little gem is amazing. - location ~ ^/sites/.*/files/imagecache/ { # For Drupal <= 6 - # location ~ ^/sites/.*/files/styles/ { # For Drupal >= 7 + # location ~ ^/sites/.*/files/imagecache/ { # For Drupal <= 6 + location ~ ^(/[a-z\-]+)?/sites/.*/files/styles/ { # For Drupal >= 7 try_files $uri @rewrite; } # Handle private files through Drupal. Private file's path can come # with a language prefix. - #location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7 - # try_files $uri /index.php?$query_string; - #} + location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7 + try_files $uri /index.php?$query_string; + } location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ { expires max; diff --git a/config/drupal6/mysql.cnf b/config/drupal6/mysql.cnf index d85e082..832cf8c 100644 --- a/config/drupal6/mysql.cnf +++ b/config/drupal6/mysql.cnf @@ -1,13 +1,14 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQLCNF [mysqld] # # * Basic Settings # # Data is stored in a volume on the db container /sql -default-storage-engine = innodb +# default-storage-engine = innodb # # * Fine Tuning @@ -71,7 +72,7 @@ max_binlog_size = 100M #innodb_buffer_pool_size = 384M #innodb_additional_mem_pool_size = 20M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 100M +innodb_log_file_size = 101M #innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 0 #innodb_lock_wait_timeout = 50 @@ -82,7 +83,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 121 # # * Security Features # diff --git a/config/drupal6/mysql8.cnf b/config/drupal6/mysql8.cnf index de0fd89..e616c5a 100644 --- a/config/drupal6/mysql8.cnf +++ b/config/drupal6/mysql8.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQL8CNF [mysqld] # @@ -49,7 +50,7 @@ read_buffer_size = 2M #server-id = 1 #log_bin = /src/.lando/log/mysql-bin.log expire_logs_days = 10 -max_binlog_size = 100M +max_binlog_size = 101M #binlog_do_db = include_database_name #binlog_ignore_db = include_database_name # @@ -77,7 +78,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 127 # # * Security Features # diff --git a/config/drupal6/php.ini b/config/drupal6/php.ini index aea65a1..6d6a378 100644 --- a/config/drupal6/php.ini +++ b/config/drupal6/php.ini @@ -1,5 +1,6 @@ [PHP] +; LANDODRUPALPHPINI ;;;;;;;;;;;;;;; ; PHP Globals ; ;;;;;;;;;;;;;;; @@ -36,8 +37,8 @@ xdebug.mode = ${XDEBUG_MODE} ; Globals expose_php = on -max_execution_time = 90 -max_input_time = 900 +max_execution_time = 91 +max_input_time = 901 max_input_vars = 10000 memory_limit = ${PHP_MEMORY_LIMIT} upload_max_filesize = 100M @@ -47,6 +48,3 @@ ignore_repeated_errors = on html_errors = off display_errors = on log_errors = on - -mbstring.http_input = pass -mbstring.http_output = pass diff --git a/config/drupal7/default.conf.tpl b/config/drupal7/default.conf.tpl index 8504dbf..18ce512 100644 --- a/config/drupal7/default.conf.tpl +++ b/config/drupal7/default.conf.tpl @@ -1,3 +1,5 @@ +# LANDODRUPALNGINXCONF + server { listen 80 default_server; listen 443 ssl; diff --git a/config/drupal7/mysql.cnf b/config/drupal7/mysql.cnf index 65f4753..832cf8c 100644 --- a/config/drupal7/mysql.cnf +++ b/config/drupal7/mysql.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQLCNF [mysqld] # @@ -71,7 +72,7 @@ max_binlog_size = 100M #innodb_buffer_pool_size = 384M #innodb_additional_mem_pool_size = 20M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 100M +innodb_log_file_size = 101M #innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 0 #innodb_lock_wait_timeout = 50 @@ -82,7 +83,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 121 # # * Security Features # diff --git a/config/drupal7/mysql8.cnf b/config/drupal7/mysql8.cnf index de0fd89..e616c5a 100644 --- a/config/drupal7/mysql8.cnf +++ b/config/drupal7/mysql8.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQL8CNF [mysqld] # @@ -49,7 +50,7 @@ read_buffer_size = 2M #server-id = 1 #log_bin = /src/.lando/log/mysql-bin.log expire_logs_days = 10 -max_binlog_size = 100M +max_binlog_size = 101M #binlog_do_db = include_database_name #binlog_ignore_db = include_database_name # @@ -77,7 +78,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 127 # # * Security Features # diff --git a/config/drupal7/php.ini b/config/drupal7/php.ini index a33dacf..6d6a378 100644 --- a/config/drupal7/php.ini +++ b/config/drupal7/php.ini @@ -1,5 +1,6 @@ [PHP] +; LANDODRUPALPHPINI ;;;;;;;;;;;;;;; ; PHP Globals ; ;;;;;;;;;;;;;;; @@ -36,8 +37,8 @@ xdebug.mode = ${XDEBUG_MODE} ; Globals expose_php = on -max_execution_time = 90 -max_input_time = 900 +max_execution_time = 91 +max_input_time = 901 max_input_vars = 10000 memory_limit = ${PHP_MEMORY_LIMIT} upload_max_filesize = 100M diff --git a/config/drupal8/default.conf.tpl b/config/drupal8/default.conf.tpl index 8504dbf..18ce512 100644 --- a/config/drupal8/default.conf.tpl +++ b/config/drupal8/default.conf.tpl @@ -1,3 +1,5 @@ +# LANDODRUPALNGINXCONF + server { listen 80 default_server; listen 443 ssl; diff --git a/config/drupal8/mysql.cnf b/config/drupal8/mysql.cnf index d85e082..832cf8c 100644 --- a/config/drupal8/mysql.cnf +++ b/config/drupal8/mysql.cnf @@ -1,13 +1,14 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQLCNF [mysqld] # # * Basic Settings # # Data is stored in a volume on the db container /sql -default-storage-engine = innodb +# default-storage-engine = innodb # # * Fine Tuning @@ -71,7 +72,7 @@ max_binlog_size = 100M #innodb_buffer_pool_size = 384M #innodb_additional_mem_pool_size = 20M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 100M +innodb_log_file_size = 101M #innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 0 #innodb_lock_wait_timeout = 50 @@ -82,7 +83,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 121 # # * Security Features # diff --git a/config/drupal8/mysql8.cnf b/config/drupal8/mysql8.cnf index de0fd89..e616c5a 100644 --- a/config/drupal8/mysql8.cnf +++ b/config/drupal8/mysql8.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQL8CNF [mysqld] # @@ -49,7 +50,7 @@ read_buffer_size = 2M #server-id = 1 #log_bin = /src/.lando/log/mysql-bin.log expire_logs_days = 10 -max_binlog_size = 100M +max_binlog_size = 101M #binlog_do_db = include_database_name #binlog_ignore_db = include_database_name # @@ -77,7 +78,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 127 # # * Security Features # diff --git a/config/drupal8/php.ini b/config/drupal8/php.ini index a33dacf..6d6a378 100644 --- a/config/drupal8/php.ini +++ b/config/drupal8/php.ini @@ -1,5 +1,6 @@ [PHP] +; LANDODRUPALPHPINI ;;;;;;;;;;;;;;; ; PHP Globals ; ;;;;;;;;;;;;;;; @@ -36,8 +37,8 @@ xdebug.mode = ${XDEBUG_MODE} ; Globals expose_php = on -max_execution_time = 90 -max_input_time = 900 +max_execution_time = 91 +max_input_time = 901 max_input_vars = 10000 memory_limit = ${PHP_MEMORY_LIMIT} upload_max_filesize = 100M diff --git a/config/drupal9/default.conf.tpl b/config/drupal9/default.conf.tpl index f939261..7b4407e 100644 --- a/config/drupal9/default.conf.tpl +++ b/config/drupal9/default.conf.tpl @@ -1,3 +1,5 @@ +# LANDODRUPALNGINXCONF + server { listen 80 default_server; listen 443 ssl; diff --git a/config/drupal9/mysql.cnf b/config/drupal9/mysql.cnf index d85e082..b8b6190 100644 --- a/config/drupal9/mysql.cnf +++ b/config/drupal9/mysql.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQLCNF [mysqld] # @@ -71,7 +72,7 @@ max_binlog_size = 100M #innodb_buffer_pool_size = 384M #innodb_additional_mem_pool_size = 20M # Set .._log_file_size to 25 % of buffer pool size -innodb_log_file_size = 100M +innodb_log_file_size = 101M #innodb_log_buffer_size = 8M innodb_flush_log_at_trx_commit = 0 #innodb_lock_wait_timeout = 50 @@ -82,7 +83,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 121 # # * Security Features # diff --git a/config/drupal9/mysql8.cnf b/config/drupal9/mysql8.cnf index de0fd89..e616c5a 100644 --- a/config/drupal9/mysql8.cnf +++ b/config/drupal9/mysql8.cnf @@ -1,6 +1,7 @@ # # The MySQL database server configuration file for Lando # +# LANDODRUPALMYSQL8CNF [mysqld] # @@ -49,7 +50,7 @@ read_buffer_size = 2M #server-id = 1 #log_bin = /src/.lando/log/mysql-bin.log expire_logs_days = 10 -max_binlog_size = 100M +max_binlog_size = 101M #binlog_do_db = include_database_name #binlog_ignore_db = include_database_name # @@ -77,7 +78,7 @@ innodb_open_files = 256 innodb_io_capacity = 512 innodb_flush_method = O_DIRECT innodb_thread_concurrency = 8 -innodb_lock_wait_timeout = 120 +innodb_lock_wait_timeout = 127 # # * Security Features # diff --git a/config/drupal9/php.ini b/config/drupal9/php.ini index a33dacf..6d6a378 100644 --- a/config/drupal9/php.ini +++ b/config/drupal9/php.ini @@ -1,5 +1,6 @@ [PHP] +; LANDODRUPALPHPINI ;;;;;;;;;;;;;;; ; PHP Globals ; ;;;;;;;;;;;;;;; @@ -36,8 +37,8 @@ xdebug.mode = ${XDEBUG_MODE} ; Globals expose_php = on -max_execution_time = 90 -max_input_time = 900 +max_execution_time = 91 +max_input_time = 901 max_input_vars = 10000 memory_limit = ${PHP_MEMORY_LIMIT} upload_max_filesize = 100M diff --git a/docs/index.md b/docs/index.md index 9df0515..24731b1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ Drupal is a free and open source content-management framework written in PHP and #### Features of this plugin: * Supports `drupal6`, `drupal7`, `drupal8`, `drupal9` and `drupal10`. -* Configurable `php` version from `5.3` all the way to `8.1` +* Configurable `php` version from `5.3` all the way to `8.3` * Configurable `webroot` * Configurable web server (`apache` or `nginx`) * Configurable database backend (`mariadb`, `mysql`, `postgres`) diff --git a/examples/.lando.local.yml b/examples/.lando.upstream.yml similarity index 100% rename from examples/.lando.local.yml rename to examples/.lando.upstream.yml diff --git a/examples/drupal-custom/.lando.yml b/examples/drupal-custom/.lando.yml index a217a53..a17fa59 100644 --- a/examples/drupal-custom/.lando.yml +++ b/examples/drupal-custom/.lando.yml @@ -1,7 +1,7 @@ name: drupal-custom recipe: drupal10 config: - php: '7.4' + php: '8.3' composer_version: '2.0.7' via: nginx:1.17 webroot: bob diff --git a/examples/drupal-custom/README.md b/examples/drupal-custom/README.md index 7a28c8b..73fbff3 100644 --- a/examples/drupal-custom/README.md +++ b/examples/drupal-custom/README.md @@ -28,8 +28,8 @@ lando ssh -s appserver -c "curl -L appserver_nginx" | grep "HI BOB" lando ssh -s appserver_nginx -c "nginx -v" 2>&1 | grep "nginx version" | grep "nginx/1.17" lando ssh -s appserver -c "curl -IL appserver_nginx" | grep Server | grep nginx -# Should use php 7.4 -lando php -v | grep "PHP 7.4" +# Should use php 8.3 +lando php -v | grep "PHP 8.3" # Should use composer 2.0.7 lando ssh -s appserver -c "/bin/sh -c 'NO_COLOR=1 composer -V'" | grep "Composer version 2.0.7" diff --git a/examples/drupal-defaults/README.md b/examples/drupal-defaults/README.md index 514069e..4a04b35 100644 --- a/examples/drupal-defaults/README.md +++ b/examples/drupal-defaults/README.md @@ -42,6 +42,12 @@ lando mysql drupal10 -e quit # Should use composer 2 by default lando ssh -s appserver -c "/bin/sh -c 'NO_COLOR=1 composer -V'" | grep "Composer version 2." + +# Should use the correct default config files +lando ssh -s appserver -c "cat /usr/local/etc/php/conf.d/zzz-lando-my-custom.ini" | grep "; LANDODRUPALPHPINI" +lando ssh -s appserver -c "curl -L http://localhost/info.php" | grep max_execution_time | grep 91 +lando ssh -s database -c "cat /opt/bitnami/mysql/conf/my_custom.cnf" | grep "LANDODRUPALMYSQLCNF" +lando mysql -u root -e "show variables;" | grep innodb_lock_wait_timeout | grep 121 ``` Destroy tests diff --git a/examples/drupal-mysql8/README.md b/examples/drupal-mysql8/README.md index e5cb4da..f39d9d6 100644 --- a/examples/drupal-mysql8/README.md +++ b/examples/drupal-mysql8/README.md @@ -17,7 +17,7 @@ lando poweroff # Initialize an empty drupal recipe rm -rf mysql8 && mkdir -p mysql8 && cd mysql8 lando init --source cwd --recipe drupal10 --webroot app/public --name lando-drupal-mysql8 --option php='8.1' --option database=mysql:8.0.22 -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml # Should start up successfully cd mysql8 @@ -54,6 +54,11 @@ lando mysql -udrupal10 -pdrupal10 drupal10 -e quit # Should have artisan available cd mysql8 lando artisan env + +# Should use the defauly mysql8 config file +cd mysql8 +lando ssh -s database -c "cat /opt/bitnami/mysql/conf/my_custom.cnf" | grep "LANDODRUPALMYSQL8CNF" +lando mysql -u root -e "show variables;" | grep innodb_lock_wait_timeout | grep 127 ``` Destroy tests diff --git a/examples/drupal-nginx/README.md b/examples/drupal-nginx/README.md index b4944bb..ac92bd0 100644 --- a/examples/drupal-nginx/README.md +++ b/examples/drupal-nginx/README.md @@ -32,6 +32,9 @@ lando nginx -v 2>&1 | grep "nginx version" | grep "nginx/1.25" # Should use the php version specified by the user eg 7.4 lando php -v | grep "PHP 7.4" + +# Should load the correct default nginx config +lando ssh -s appserver_nginx -c "cat /opt/bitnami/nginx/conf/vhosts/lando.conf" | grep "LANDODRUPALNGINXCONF" ``` Destroy tests diff --git a/examples/drupal10-mysql8/README.md b/examples/drupal10-mysql8/README.md index 43ae536..abff72c 100644 --- a/examples/drupal10-mysql8/README.md +++ b/examples/drupal10-mysql8/README.md @@ -20,7 +20,7 @@ lando init --source remote --remote-url https://ftp.drupal.org/files/projects/dr # Should start up successfully cd mysql8 -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml lando start ``` diff --git a/examples/drupal10-nginx/README.md b/examples/drupal10-nginx/README.md index abf49c4..1bce844 100644 --- a/examples/drupal10-nginx/README.md +++ b/examples/drupal10-nginx/README.md @@ -20,7 +20,7 @@ lando init --source remote --remote-url https://ftp.drupal.org/files/projects/dr # Should start up successfully cd nginx -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml lando start ``` diff --git a/examples/drupal10/README.md b/examples/drupal10/README.md index ab1eeea..e294939 100644 --- a/examples/drupal10/README.md +++ b/examples/drupal10/README.md @@ -20,7 +20,7 @@ lando init --source remote --remote-url https://ftp.drupal.org/files/projects/dr # Should start up successfully cd drupal10 -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml lando start ``` diff --git a/examples/drupal6/README.md b/examples/drupal6/README.md index 7a25185..7db08ce 100644 --- a/examples/drupal6/README.md +++ b/examples/drupal6/README.md @@ -20,7 +20,7 @@ lando init --source remote --remote-url https://ftp.drupal.org/files/projects/dr # Should start up successfully cd drupal6 -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml lando start ``` diff --git a/examples/drupal7/README.md b/examples/drupal7/README.md index 78a78e5..8d6d320 100644 --- a/examples/drupal7/README.md +++ b/examples/drupal7/README.md @@ -20,7 +20,7 @@ lando init --source remote --remote-url https://ftp.drupal.org/files/projects/dr # Should start up successfully cd drupal7 -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml lando start ``` diff --git a/examples/drupal8/README.md b/examples/drupal8/README.md index e01d2a8..ec866ec 100644 --- a/examples/drupal8/README.md +++ b/examples/drupal8/README.md @@ -18,8 +18,9 @@ lando poweroff rm -rf drupal8 && mkdir -p drupal8 && cd drupal8 lando init --source remote --remote-url https://ftp.drupal.org/files/projects/drupal-8.9.20.tar.gz --remote-options="--strip-components 1" --recipe drupal8 --webroot . --name lando-drupal8 --option database=mysql:8.0 --option composer_version=2.1.14 -# Should copy in the .lando.local.yml -cp -f .lando.local.yml drupal8/.lando.local.yml +# Should copy in the .lando.upstream.yml +cd drupal8 +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml # Should start up successfully cd drupal8 @@ -61,9 +62,9 @@ lando php -m | grep xdebug || echo $? | grep 1 cd drupal8 lando mysql -udrupal8 -pdrupal8 drupal8 -e quit -# Should use drush 10.2.1 +# Should use drush 8.4.8 cd drupal8 -lando drush version | grep 10.2.1 +lando drush version | grep 8.4.8 # Should be able to install drupal cd drupal8 diff --git a/examples/drupal9/README.md b/examples/drupal9/README.md index cb1d5d3..79ca3ba 100644 --- a/examples/drupal9/README.md +++ b/examples/drupal9/README.md @@ -20,7 +20,7 @@ lando init --source remote --remote-url https://ftp.drupal.org/files/projects/dr # Should start up successfully cd drupal9 -cp -f ../../.lando.local.yml .lando.local.yml && cat .lando.local.yml +cp -f ../../.lando.upstream.yml .lando.upstream.yml && cat .lando.upstream.yml lando start ``` diff --git a/package-lock.json b/package-lock.json index 9538f78..d4097d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,14 +6,14 @@ "packages": { "": { "name": "@lando/drupal", - "version": "1.0.1", + "version": "1.1.0", "license": "GPL-3.0", "dependencies": { "@lando/mariadb": "^1.0.0", "@lando/mssql": "^1.0.0", "@lando/mysql": "^1.0.0", "@lando/nginx": "^1.0.0", - "@lando/php": "^1.0.0", + "@lando/php": "^1.2.0", "@lando/postgres": "^1.0.0", "lodash": "^4.17.21", "semver": "^7.5.4" @@ -1510,9 +1510,9 @@ "license": "MIT" }, "node_modules/@lando/php": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.0.0.tgz", - "integrity": "sha512-V8agZOazxpeytCV/OxcL7oxgRQq+lVyb7EyOCPNsBAlXQ2LEOVzbXhFufC1exhOoLxTHu18jdOyx44E5vlc3mg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.2.0.tgz", + "integrity": "sha512-afFC6qiUZHR61KeRAwGmJUrCtd0LfMyHhArsluT+xuscBR1/55h7SXgl3os6pHoyJl0oKEFGkbiAdxlqOq3ZKA==", "bundleDependencies": [ "@lando/nginx", "lodash", diff --git a/package.json b/package.json index 335792b..36917f2 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@lando/mssql": "^1.0.0", "@lando/mysql": "^1.0.0", "@lando/nginx": "^1.0.0", - "@lando/php": "^1.0.0", + "@lando/php": "^1.2.0", "@lando/postgres": "^1.0.0", "lodash": "^4.17.21", "semver": "^7.5.4"