Committing test-no-solr changes

UTS-eResearch · Dec 23, 2019 · c01e139 · c01e139
1 parent 314bcab
commit c01e139
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/conf.d/ocfl.conf b/conf.d/ocfl.conf
@@ -9,25 +9,59 @@ server {
     set $ocfl_files /etc/share/nginx/html/ocfl;
     set $ocfl_index_file ro-crate-preview.html;
 
-    location /migrate_ocfl/ {
+    location /uat_staging_ocfl/ {
         autoindex on;
         index CATALOG.html;
         root $ocfl_files;
     }
 
-    location /repo/ {
-        set $ocfl_repo migrate_ocfl;
-        set $ocfl_path repo;
+    location /uat_public_ocfl/ {
+        autoindex on;
+        index CATALOG.html;
+        root $ocfl_files;
+    }
+
+    location /public_ocfl/ {
+        autoindex on;
+        index ro-crate-preview.html;
+        root $ocfl_files;
+    }
+
+    location /uat_staging/ {
+        set $ocfl_repo uat_staging_ocfl;
+        set $ocfl_path uat_staging;
         set $ocfl_versions off;
         js_content ocfl;
     }
 
-    location /solr/ {
+    location /uat_public/ {
+        set $ocfl_repo uat_public_ocfl;
+        set $ocfl_path uat_public;
+        set $ocfl_versions off;
+        js_content ocfl;
+    }
+
+    location /public/ {
+        set $ocfl_repo public_ocfl;
+        set $ocfl_path public;
+        set $ocfl_versions off;
+        js_content ocfl;
+    }
+
+    location /solr_old/ {
         set $args ${args}&fq=license:public;
         proxy_pass http://solr:8983;
     }
 
 
+    location /solr/ {
+        proxy_pass http://solr:8983/solr/migrate_ocfl/;
+        limit_except GET {
+            deny all;
+        }
+    }
+
+
 }
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,6 +26,6 @@ services:
     networks:
       - main
     volumes:
-      - "./test_solr/:/opt/solr/server/solr/public_ocfl"
-    command: solr-precreate public_ocfl
+      - "./test_solr/:/opt/solr/server/solr/migrate_ocfl"
+    command: solr-precreate migrate_ocfl