Release 2.1.1

Merge branch 'main' into production

Author: tormi

.circleci/config.yml

@@ -12,15 +12,15 @@ executors:
 
 # Define shared branch filters as reusable anchors.
 branch-filters:
-  &ignored-branches
-  branches:
-    ignore:
-      - production
-      - main
-      - /dependabot\/.*/
-      # Remove the following filters from actual project configuration.
-      - /^10\..*/
-      - /^11\..*/
+  ignored-branches: &ignored-branches
+    branches:
+      ignore:
+        - production
+        - main
+        - /dependabot\/.*/
+        # Remove the following filters from actual project configuration.
+        - /^10\..*/
+        - /^11\..*/
 
 workflows:
   commit:

.ddev/addon-metadata/elasticsearch/manifest.yaml

@@ -1,9 +1,9 @@
 name: elasticsearch
 repository: ddev/ddev-elasticsearch
 version: v0.3.2
-install_date: "2024-08-13T10:51:11+03:00"
+install_date: "2025-03-21T10:53:19+02:00"
 project_files:
-    - elasticsearch/config/elasticsearch8.yml
+    - elasticsearch/
     - docker-compose.elasticsearch8.yaml
 global_files: []
 removal_actions: []

.ddev/config.yaml

@@ -26,18 +26,20 @@ web_environment:
   - ELASTICSEARCH_HOST=elasticsearch
   - VARNISH_ADMIN_HOST=varnish
   - VARNISH_ADMIN_PORT=80
+  - SMTP_ADDRESS=localhost:1025
 
 corepack_enable: false
 hooks:
   post-start:
     - exec: "composer install"
-    - exec: |
-        plugins=(analysis-icu analysis-ukrainian)
-        for plugin in "${plugins[@]}"; do
-          if ! elasticsearch-plugin list | grep -q "^$plugin\b"; then
-            elasticsearch-plugin install "$plugin"
-          else
-            echo "Plugin $plugin is already installed"
-          fi
-        done
-      service: elasticsearch
+    - exec: "npm ci"
+    - exec-host: |
+        # Run the Elasticsearch plugin setup script
+        ddev exec -s elasticsearch /mnt/ddev_config/elasticsearch/elasticsearch-setup.sh
+
+        # Check for the restart marker file
+        if [ -f .ddev/elasticsearch/restart_needed ]; then
+          echo "Elasticsearch plugins installed. Restarting elasticsearch container..."
+          docker restart ddev-${DDEV_SITENAME}-elasticsearch
+          rm .ddev/elasticsearch/restart_needed
+        fi

.ddev/docker-compose.elasticsearch8.yaml

@@ -14,6 +14,7 @@ services:
       - VIRTUAL_HOST=$DDEV_HOSTNAME
       - HTTP_EXPOSE=9200:9200
       - HTTPS_EXPOSE=9201:9200
+      - ELASTICSEARCH_PLUGINS=analysis-icu
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: $DDEV_APPROOT

.ddev/elasticsearch/config/elasticsearch8.yml

@@ -1,4 +1,3 @@
-#ddev-generated
 # This file contains the configuration settings for Elasticsearch 8.
 # For more information, see https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
 
@@ -8,7 +7,8 @@ cluster.name: "docker-cluster"
 # https://www.elastic.co/guide/en/elasticsearch/reference/current/important-settings.html#network.host
 network.host: 0.0.0.0
 
-# Security settings
+# Disable security features
+# https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html#general-security-settings
 xpack.security.enabled: false
 xpack.security.autoconfiguration.enabled: false
 xpack.security.enrollment.enabled: false

.ddev/elasticsearch/elasticsearch-setup.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Exit if no plugins specified
+[ -z "$ELASTICSEARCH_PLUGINS" ] && echo "No plugins specified in ELASTICSEARCH_PLUGINS" && exit 0
+
+echo "Installing Elasticsearch plugins: $ELASTICSEARCH_PLUGINS"
+needs_restart=false
+
+# Process each plugin
+for plugin in $ELASTICSEARCH_PLUGINS; do
+    # Skip if already installed
+    if bin/elasticsearch-plugin list | grep -q "$plugin"; then
+        echo "✓ Plugin $plugin already installed"
+        continue
+    fi
+
+    # Install plugin
+    echo "Installing $plugin plugin..."
+    if bin/elasticsearch-plugin install "$plugin"; then
+        chown -R elasticsearch:root "/usr/share/elasticsearch/plugins/$plugin" && \
+        chmod -R 755 "/usr/share/elasticsearch/plugins/$plugin" && \
+        echo "✓ Plugin $plugin installed successfully" && \
+        needs_restart=true
+    else
+        echo "✗ Failed to install plugin $plugin"
+        exit 1
+    fi
+done
+
+# Signal for restart if needed
+if [ "$needs_restart" = true ]; then
+    echo "New plugins were installed. Elasticsearch needs to be restarted."
+
+    # Create a marker file in the mounted config directory (visible to host)
+    touch /mnt/ddev_config/elasticsearch/restart_needed
+fi
+
+exit 0

.lando.yml

@@ -125,7 +125,7 @@ services:
   #       - esdata:/usr/share/elasticsearch/data
   #   # Install ES plugins.
   #   build_as_root:
-  #     - elasticsearch-plugin install analysis-icu analysis-ukrainian
+  #     - elasticsearch-plugin install analysis-icu
   #   volumes:
   #     esdata:
   #       driver: local

README.md

@@ -121,6 +121,41 @@ For a complete list of all available services, URLs, and ports, use:
 - `ddev xdebug <mode>` - Configure Xdebug debugging modes
 - `ddev syncdb [environment]` - Sync database from remote environment (requires VPN and `ddev auth ssh`, see `scripts/syncdb.sh` for details)
 
+<details>
+<summary>DDEV Elasticsearch configuration</summary>
+
+#### DDEV Elasticsearch configuration
+
+This project includes Elasticsearch service for robust full-text search capabilities. It's automatically set up during DDEV initialization.
+
+##### Plugins configuration
+
+- Pre-configured with `analysis-icu` for Unicode/multilingual text processing
+- Additional plugins can be defined in `.ddev/docker-compose.elasticsearch8.yaml`
+
+```yaml
+services:
+  elasticsearch:
+    environment:
+      - ELASTICSEARCH_PLUGINS=analysis-icu  # Space-separated plugin list
+```
+
+##### Useful commands
+
+```bash
+# Check Elasticsearch status
+ddev exec -s elasticsearch "curl -s localhost:9200"
+
+# List installed plugins
+ddev exec -s elasticsearch "bin/elasticsearch-plugin list"
+```
+
+##### Web interface
+
+Elasticvue is included for visualization and management at <http://drupal-project.ddev.site:9005>
+
+</details>
+
 <details>
 <summary>Lando environment</summary>
 

web/sites/default/settings.php

@@ -105,16 +105,6 @@
     $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
     $settings['cache']['bins']['page'] = 'cache.backend.null';
     $settings['extension_discovery_scan_tests'] = FALSE;
-
-    // Override drupal/symfony_mailer default config to use Mailpit.
-    if ($env === 'ddev') {
-      $config['symfony_mailer.settings']['default_transport'] = 'sendmail';
-      $config['symfony_mailer.mailer_transport.sendmail']['plugin'] = 'smtp';
-      $config['symfony_mailer.mailer_transport.sendmail']['configuration']['user'] = '';
-      $config['symfony_mailer.mailer_transport.sendmail']['configuration']['pass'] = '';
-      $config['symfony_mailer.mailer_transport.sendmail']['configuration']['host'] = 'localhost';
-      $config['symfony_mailer.mailer_transport.sendmail']['configuration']['port'] = '1025';
-    }
     break;
 
   default: