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

Drupal 10 support #289

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Drupal 10 support #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c65c93
Remove pipe flag from drush
joecorall Sep 20, 2023
e9b614f
Also fix reverse_proxy_trusted_headers
joecorall Sep 20, 2023
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
10 changes: 5 additions & 5 deletions drupal/rootfs/etc/islandora/utilities.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ function configure_islandora_module {
# Configure Solr port and host.
function configure_islandora_default_module {
local site site_url host port
if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q search_api; then
if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q search_api; then
echo "Search API is not installed. Skipping configuration"
return 0
fi
Expand Down Expand Up @@ -514,7 +514,7 @@ function configure_search_api_solr_module {
# Enables and sets carapace as the default theme.
function set_carapace_default_theme {
local site site_url
if ! drush pm-list --pipe --type=theme --status=enabled --no-core | grep -q carapace; then
if ! drush pm-list --format=string --type=theme --status=enabled --no-core | grep -q carapace; then
echo "carapace is not available. Skipping configuration."
return 0
fi
Expand Down Expand Up @@ -569,7 +569,7 @@ function create_solr_core {
# Generate solr config and create a core for it.
function create_solr_core_with_default_config {
local site
if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q search_api_solr; then
if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q search_api_solr; then
echo "search_api_solr is not installed. Skipping core setup."
return 0
fi
Expand All @@ -584,7 +584,7 @@ function create_solr_core_with_default_config {
function configure_matomo_module {
local site site_url site_id matomo_url matomo_http_url

if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q matomo; then
if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q matomo; then
echo "matomo is not installed. Skipping configuration"
return 0
fi
Expand All @@ -605,7 +605,7 @@ function configure_matomo_module {
function configure_openseadragon {
local site site_url cantaloupe_url

if ! drush pm-list --pipe --type=module --status=enabled --no-core | grep -q openseadragon; then
if ! drush pm-list --format=string --type=module --status=enabled --no-core | grep -q openseadragon; then
echo "openseadragon is not installed. Skipping configuration"
return 0
fi
Expand Down
4 changes: 3 additions & 1 deletion drupal/rootfs/usr/share/drush/Commands/UpdateSettingsCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,9 @@ public function setReverseProxySettings($reverse_proxy_ips) {
'required' => TRUE,
];
$settings['settings']['reverse_proxy_trusted_headers'] = (object) [
'value' => \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL | \Symfony\Component\HttpFoundation\Request::HEADER_FORWARDED,
'value' => \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR |
\Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO |
\Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT,
'required' => TRUE,
];
$this->writeSettings($settings);
Expand Down