From 12d34a53f46e727622cb70bef5afc79c8a3711d0 Mon Sep 17 00:00:00 2001 From: Alex Boyd Date: Tue, 9 Jan 2024 02:39:46 +0000 Subject: [PATCH] Set nginx confs to point at prod solr --- nginx_conf/scholarspace-ssl.conf | 5 ++--- nginx_conf/scholarspace.conf | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nginx_conf/scholarspace-ssl.conf b/nginx_conf/scholarspace-ssl.conf index bcf63197..902b9df3 100644 --- a/nginx_conf/scholarspace-ssl.conf +++ b/nginx_conf/scholarspace-ssl.conf @@ -3,8 +3,7 @@ server { server_name ${SERVER_NAME}; root /opt/scholarspace/scholarspace-hyrax/public; - - location /solr/${SOLR_CORE_PROD}/select/ { + location /solr/${SOLR_CORE}/select/ { limit_except GET { deny all; } @@ -16,7 +15,7 @@ server { add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; - proxy_pass http://solr-hyrax:8983/solr/${SOLR_CORE_PROD}/select/; + proxy_pass http://solr-hyrax:8983/solr/${SOLR_CORE}/select/; } ssl_certificate /opt/scholarspace/certs/${NGINX_CERTIFICATE}; diff --git a/nginx_conf/scholarspace.conf b/nginx_conf/scholarspace.conf index 1d0aec95..63c61e68 100644 --- a/nginx_conf/scholarspace.conf +++ b/nginx_conf/scholarspace.conf @@ -3,7 +3,7 @@ server { server_name ${SERVER_NAME}; root /opt/scholarspace/scholarspace-hyrax/public; - location /solr/${SOLR_CORE_DEV}/select/ { + location /solr/${SOLR_CORE}/select/ { limit_except GET { deny all; } @@ -15,7 +15,7 @@ server { add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; - proxy_pass http://solr-hyrax:8983/solr/${SOLR_CORE_DEV}/select/; + proxy_pass http://solr-hyrax:8983/solr/${SOLR_CORE}/select/; } # The following deploys your Ruby/Python/Node.js/Meteor app on Passenger.