Testing for config loading. Update @lando/php. (#96)

* Testing for config loading. Update @lando/php. * Fix tests. * Use lando.upstream.yml. * Correct upstream lando file config for drupal8. * Correct version of drush in D8 test.
lando · Feb 26, 2024 · a99c4b5 · a99c4b5
1 parent 9da8e65
commit a99c4b5
Show file tree

Hide file tree

Showing 37 changed files with 111 additions and 63 deletions.
diff --git 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/[email protected]`
+* 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+# LANDODRUPALNGINXCONF
+
 server {
   listen 80 default_server;
   listen 443 ssl;