Updating SOLR core back to ISLANDORA to match buildkit. Cleaning up R…

…EADME fragments.

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=*:*"
+* `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).

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