Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Feb 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58e4f18
Testing for config loading. Update @lando/php.
reynoldsalec Feb 23, 2024
24c2a57
Fix tests.
reynoldsalec Feb 23, 2024
dc35596
Use lando.upstream.yml.
reynoldsalec Feb 26, 2024
0ac0265
Correct upstream lando file config for drupal8.
reynoldsalec Feb 26, 2024
f330149
Correct version of drush in D8 test.
reynoldsalec Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 2 additions & 0 deletions config/drupal10/default.conf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# LANDODRUPALNGINXCONF

server {
listen 80 default_server;
listen 443 ssl;
Expand Down
5 changes: 3 additions & 2 deletions config/drupal10/mysql.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# The MySQL database server configuration file for Lando
#
# LANDODRUPALMYSQLCNF

[mysqld]
#
Expand Down Expand Up @@ -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
Expand All @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal10/mysql8.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# The MySQL database server configuration file for Lando
#
# LANDODRUPALMYSQL8CNF

[mysqld]
#
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal10/php.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[PHP]

; LANDODRUPALPHPINI
;;;;;;;;;;;;;;;
; PHP Globals ;
;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions config/drupal6/default.conf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# LANDODRUPALNGINXCONF

server {
listen 80 default_server;
listen 443 ssl;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions config/drupal6/mysql.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal6/mysql8.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# The MySQL database server configuration file for Lando
#
# LANDODRUPALMYSQL8CNF

[mysqld]
#
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -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
#
Expand Down
8 changes: 3 additions & 5 deletions config/drupal6/php.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[PHP]

; LANDODRUPALPHPINI
;;;;;;;;;;;;;;;
; PHP Globals ;
;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions config/drupal7/default.conf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# LANDODRUPALNGINXCONF

server {
listen 80 default_server;
listen 443 ssl;
Expand Down
5 changes: 3 additions & 2 deletions config/drupal7/mysql.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# The MySQL database server configuration file for Lando
#
# LANDODRUPALMYSQLCNF

[mysqld]
#
Expand Down Expand Up @@ -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
Expand All @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal7/mysql8.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# The MySQL database server configuration file for Lando
#
# LANDODRUPALMYSQL8CNF

[mysqld]
#
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal7/php.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[PHP]

; LANDODRUPALPHPINI
;;;;;;;;;;;;;;;
; PHP Globals ;
;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/drupal8/default.conf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# LANDODRUPALNGINXCONF

server {
listen 80 default_server;
listen 443 ssl;
Expand Down
7 changes: 4 additions & 3 deletions config/drupal8/mysql.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal8/mysql8.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# The MySQL database server configuration file for Lando
#
# LANDODRUPALMYSQL8CNF

[mysqld]
#
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -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
#
Expand Down
5 changes: 3 additions & 2 deletions config/drupal8/php.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[PHP]

; LANDODRUPALPHPINI
;;;;;;;;;;;;;;;
; PHP Globals ;
;;;;;;;;;;;;;;;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/drupal9/default.conf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# LANDODRUPALNGINXCONF

server {
listen 80 default_server;
listen 443 ssl;
Expand Down
Loading
Loading