Solr 9 local instance (solr9, :8986, configsets from solr_cores_stage worktree)
- make solr8 / make solr9 switches local Drupal via untracked settings.solr.php - update_solr_config.sh clears conf/ before unzipping the generated config Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -13,3 +13,4 @@ ai-docs/
|
|||||||
solr_cores_stage/
|
solr_cores_stage/
|
||||||
AGENTS.md
|
AGENTS.md
|
||||||
.vibe/
|
.vibe/
|
||||||
|
var_solr9/
|
||||||
|
|||||||
@@ -112,4 +112,10 @@ dump_d8_db:
|
|||||||
docker exec materiod8-mysql-1 sh -c 'exec mariadb-dump -uroot -pmaterio materio_d8' > ./ressources/materio-d8-$(DATE_NOW)-local.sql
|
docker exec materiod8-mysql-1 sh -c 'exec mariadb-dump -uroot -pmaterio materio_d8' > ./ressources/materio-d8-$(DATE_NOW)-local.sql
|
||||||
|
|
||||||
sish:
|
sish:
|
||||||
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
|
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
|
||||||
|
|
||||||
|
solr8:
|
||||||
|
bin/solr_switch.sh 8
|
||||||
|
|
||||||
|
solr9:
|
||||||
|
bin/solr_switch.sh 9
|
||||||
|
|||||||
Executable
+20
@@ -0,0 +1,20 @@
|
|||||||
|
#! /bin/bash
|
||||||
|
# Bascule le Drupal local entre Solr 8 (branche prod) et Solr 9 (branche stage).
|
||||||
|
# bin/solr_switch.sh 8|9
|
||||||
|
# Écrit (ou supprime) web/sites/default/settings.solr.php, inclus par settings.php, puis drush cr.
|
||||||
|
cd "$(dirname "${BASH_SOURCE[0]}")/.." || exit 1
|
||||||
|
F=public_html/web/sites/default/settings.solr.php
|
||||||
|
case "$1" in
|
||||||
|
8) rm -f "$F" ;;
|
||||||
|
9) cat > "$F" <<'PHP'
|
||||||
|
<?php
|
||||||
|
// Généré par bin/solr_switch.sh 9 : Drupal local -> conteneur solr9 (Solr 9)
|
||||||
|
foreach (['materio', 'database_search_autocomplete'] as $server) {
|
||||||
|
$config["search_api.server.$server"]['backend_config']['connector_config']['host'] = 'solr9';
|
||||||
|
$config["search_api.server.$server"]['backend_config']['connector_config']['solr_version'] = '9';
|
||||||
|
}
|
||||||
|
PHP
|
||||||
|
;;
|
||||||
|
*) echo "usage: $0 8|9" >&2; exit 1 ;;
|
||||||
|
esac
|
||||||
|
docker exec materiod8-php-1 drush cr >/dev/null && echo "Drupal local -> Solr $1"
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
# puis recharge les cores (RELOAD, sans restart).
|
# puis recharge les cores (RELOAD, sans restart).
|
||||||
#
|
#
|
||||||
# bin/update_solr_config.sh -> solr_cores (branche prod, Solr 8, :8985)
|
# bin/update_solr_config.sh -> solr_cores (branche prod, Solr 8, :8985)
|
||||||
# bin/update_solr_config.sh solr_cores_stage URL -> worktree stage (Solr 9, phase 2)
|
# bin/update_solr_config.sh solr_cores_stage http://localhost:8986/solr -> worktree stage (Solr 9, après make solr9)
|
||||||
#
|
#
|
||||||
# Les modifications restent à relire / committer dans l'arbre visé (git diff).
|
# Les modifications restent à relire / committer dans l'arbre visé (git diff).
|
||||||
|
|
||||||
@@ -22,8 +22,10 @@ docker exec -i materiod8-php-1 drush solr-gsc database_search_autocomplete confi
|
|||||||
mkdir -p ressources/solr/
|
mkdir -p ressources/solr/
|
||||||
mv public_html/web/config.zip ressources/solr/ || exit 1
|
mv public_html/web/config.zip ressources/solr/ || exit 1
|
||||||
|
|
||||||
|
# conf/ entièrement généré : on vide avant de décompresser (les fichiers retirés apparaissent dans git status)
|
||||||
for core in $CORES; do
|
for core in $CORES; do
|
||||||
unzip -o ressources/solr/config.zip -d "$TREE/$core/conf"
|
find "$TREE/$core/conf" -type f -delete
|
||||||
|
unzip -q -o ressources/solr/config.zip -d "$TREE/$core/conf"
|
||||||
done
|
done
|
||||||
|
|
||||||
for core in $CORES; do
|
for core in $CORES; do
|
||||||
|
|||||||
@@ -74,6 +74,22 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- 8985:8983
|
- 8985:8983
|
||||||
|
|
||||||
|
# Solr 9 pour la branche stage (même structure, configsets = worktree solr_cores_stage)
|
||||||
|
solr9:
|
||||||
|
image: solr:9.11.0
|
||||||
|
environment:
|
||||||
|
- SOLR_HOME=/var/solr/data
|
||||||
|
- SOLR_MODULES=extraction,langid,ltr,analysis-extras
|
||||||
|
# Solr 9 (security manager) : autorise la lecture des configsets hors SOLR_HOME
|
||||||
|
- SOLR_OPTS=-Dsolr.allowPaths=/opt/configsets
|
||||||
|
volumes:
|
||||||
|
- ./var_solr9:/var/solr
|
||||||
|
- ./solr_cores_stage:/opt/configsets:ro
|
||||||
|
networks:
|
||||||
|
- solr
|
||||||
|
ports:
|
||||||
|
- 8986:8983
|
||||||
|
|
||||||
# solr-legacy:
|
# solr-legacy:
|
||||||
# build: ./Docker/solr-legacy/
|
# build: ./Docker/solr-legacy/
|
||||||
# volumes:
|
# volumes:
|
||||||
@@ -113,6 +129,7 @@ services:
|
|||||||
# - mysql-legacy
|
# - mysql-legacy
|
||||||
- redis
|
- redis
|
||||||
- solr
|
- solr
|
||||||
|
- solr9
|
||||||
|
|
||||||
# php-legacy:
|
# php-legacy:
|
||||||
# build: ./Docker/php-legacy/
|
# build: ./Docker/php-legacy/
|
||||||
|
|||||||
Reference in New Issue
Block a user