From 2adebb9d0e1ababe76082474a33fdbcaa7ac3e6d Mon Sep 17 00:00:00 2001 From: Gavin Morris Date: Fri, 5 Jun 2020 11:59:51 -0400 Subject: [PATCH] Updating SOLR core back to ISLANDORA to match buildkit. Cleaning up README fragments. --- docs/MERGE_NOTES.md | 9 +-------- scripts/solr/create-core.sh | 10 +++++----- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/docs/MERGE_NOTES.md b/docs/MERGE_NOTES.md index 0ad570210..94f0b755c 100644 --- a/docs/MERGE_NOTES.md +++ b/docs/MERGE_NOTES.md @@ -14,11 +14,4 @@ * `docker exec -it islandora_drupal_1 bash -c "drush cr"` * reset the admin user password * `docker exec -it islandora_drupal_1 bash -c "drush uli"` -* `make down` will shut things off. `make clean` will clean it all up. If you want to run dc commands manually, just remember to use `-p islandora` (see Makefile for examples). - -### To clear cache - -* `docker exec -it islandora_drupal_1 bash -c "drush cr"` - - -curl "http://solr:8983/solr/select?indent=on&q=*:*" \ No newline at end of file +* `make down` will shut things off. `make clean` will clean it all up. If you want to run dc commands manually, just remember to use `-p islandora` (see Makefile for examples). \ No newline at end of file diff --git a/scripts/solr/create-core.sh b/scripts/solr/create-core.sh index a4c4fafc9..1fdbee84d 100644 --- a/scripts/solr/create-core.sh +++ b/scripts/solr/create-core.sh @@ -5,14 +5,14 @@ cd /var/www/drupal/ || exit drush -y solr-gsc default_solr_server /tmp/solr_config.zip 7.1 -mkdir -p /opt/solr/server/solr/islandora/conf || true +mkdir -p /opt/solr/server/solr/ISLANDORA/conf || true -mkdir -p /opt/solr/server/solr/islandora/data || true +mkdir -p /opt/solr/server/solr/ISLANDORA/data || true -unzip -o /tmp/solr_config.zip -d /opt/solr/server/solr/islandora/conf +unzip -o /tmp/solr_config.zip -d /opt/solr/server/solr/ISLANDORA/conf # The uid:gid "100:1000" is "solr:solr" inside of the solr container. -chown -R 100:1000 /opt/solr/server/solr/islandora +chown -R 100:1000 /opt/solr/server/solr/ISLANDORA -curl -s "http://solr:8983/solr/admin/cores?action=CREATE&name=islandora&instanceDir=islandora&config=solrconfig.xml&dataDir=data" &> /dev/null +curl -s "http://solr:8983/solr/admin/cores?action=CREATE&name=ISLANDORA&instanceDir=ISLANDORA&config=solrconfig.xml&dataDir=data" &> /dev/null