Fix/41 correction of solr ports v2

Merge branch 'development' into 'master'

Closes #41

See merge request sdbm/sdbmss!41

README-development.md

@@ -50,7 +50,12 @@ Generate separate keys (for each) by running rails task secret.
 
 URL for SOLR server, using relative location of docker service (using name 'solr' from docker-compose.yml)
 
-			SOLR_URL=http://solr:8982/solr/development
+NB: The SOLR port here and everywhere else in the code is `8983`. Previous versions
+of the code had `8982` in some cases. This was wrong and created a conflict
+between Jetty (which was set to `8983` and the docker-compose values, which
+had `8982`).
+
+			SOLR_URL=http://solr:8983/solr/development
 
 **3. Build and Run (First Time)**
 

README.md

@@ -75,7 +75,12 @@ DEPRECATED -- USING ANSIBLE
 
   URL for SOLR server, using relative location of docker service (using name 'solr' from docker-compose.yml)
 
-			SOLR_URL=http://solr:8982/solr/development
+NB: The SOLR port here and everywhere else in the code is `8983`. Previous versions
+of the code had `8982` in some cases. This was wrong and created a conflict 
+between Jetty (which was set to `8983` and the docker-compose values, which 
+had `8982`). 
+
+			SOLR_URL=http://solr:8983/solr/development
 
 **3. (Optional) Create a file VERSION in the root folder of the cloned repository.**
 

config/SolrMarc/config.properties

@@ -28,7 +28,7 @@ solr.indexer.properties = index.properties
 # NOTE: 
 # When using the solr:marc:index rake task, this value will be automatically
 # looked up from your solr.yml, and the value here will NOT be used. 
-solr.hosturl = http://localhost:8982/solr/update
+solr.hosturl = http://localhost:8983/solr/update
 
 # MARC handling parameters
 marc.to_utf_8 = true

config/sunspot.yml

@@ -6,7 +6,7 @@
 production:
   solr:
     # hostname: localhost
-    port: 8982
+    port: 8983
     log_level: WARNING
     # path: /solr/production
     # read_timeout: 2

docker-compose-dev.yml

@@ -42,7 +42,7 @@ services:
       context: .
       dockerfile: Dockerfile
     ports:
-      - "8982:8982"
+      - "8983:8983"
     # logging:
       # driver: "journald"
     links:

docker-compose.yml

@@ -63,7 +63,7 @@ services:
     image: 'gitlab.library.upenn.edu/sdbm/sdbmss/sdbmss_web:${SDBMSS_IMAGE_TAG}'
     restart: always
     ports:
-      - "8982:8982"
+      - "8983:8983"
     # env_file: .docker-environment
     # logging:
       # driver: "journald"

lib/sdbmss/util.rb

@@ -507,7 +507,7 @@ def int? s
       # really can take 5 secs, if not more.
       def wait_for_solr_to_be_current
         host = ENV['SOLR_URL'].present? ? URI(ENV['SOLR_URL']).host : 'localhost'
-        uri = "http://#{host}:8982/solr/admin/cores?action=STATUS&core=test"
+        uri = "http://#{host}:8983/solr/admin/cores?action=STATUS&core=test"
 
         current = false
         count = 0

run_tests.sh

@@ -5,7 +5,7 @@
 # Do NOT use this when running in a Docker container!
 
 export RAILS_ENV=test
-export SOLR_URL="http://127.0.0.1:8982/solr/test"
+export SOLR_URL="http://127.0.0.1:8983/solr/test"
 
 bundle exec god -c sdbmss_test.god -l log/god_test.log
 

sdbmss_nginx/nginx.conf

@@ -18,7 +18,7 @@ http {
 
         upstream solr {
               least_conn;
-              server solr:8982 weight=10 max_fails=3 fail_timeout=30s;
+              server solr:8983 weight=10 max_fails=3 fail_timeout=30s;
         }
 
         server {

solr/conf/scripts.conf

@@ -15,7 +15,7 @@
 
 user=
 solr_hostname=localhost
-solr_port=8982
+solr_port=8983
 rsyncd_port=18983
 data_dir=
 webapp_name=solr