Merge pull request #1034 from research-software-directory/remove-oaip…

…mh-table Remove OAI-PMH table
research-software-directory · Oct 31, 2023 · 0257c93 · 0257c93
2 parents 3b7a10e + a886b73
commit 0257c93
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 75 deletions.
diff --git a/.env.example b/.env.example
@@ -156,11 +156,6 @@ MAX_REQUESTS_GITLAB=6
 # consumed by: scrapers
 MAX_REQUESTS_DOI=6
 
-# Fill in any non-empty string to enable the oaipmh scraper.
-# When commented it is disabled.
-# consumed by: scrapers
-#ENABLE_OAIPMH_SCRAPER=True
-
 # ---- SECRETS ------ SECRETS -----------
 
 # consumed by services: database

diff --git a/database/017-create-narcis-table.sql b/database/017-create-narcis-table.sql
diff --git a/database/020-row-level-security.sql b/database/020-row-level-security.sql
@@ -1,8 +1,8 @@
 -- SPDX-FileCopyrightText: 2021 - 2023 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
 -- SPDX-FileCopyrightText: 2021 - 2023 Netherlands eScience Center
 -- SPDX-FileCopyrightText: 2022 - 2023 Dusan Mijatovic (dv4all)
--- SPDX-FileCopyrightText: 2022 - 2023 dv4all
 -- SPDX-FileCopyrightText: 2022 - 2023 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
+-- SPDX-FileCopyrightText: 2022 - 2023 dv4all
 -- SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) <christian.meessen@gfz-potsdam.de>
 -- SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
 -- SPDX-FileCopyrightText: 2023 Felix Mühlbauer (GFZ) <felix.muehlbauer@gfz-potsdam.de>
@@ -724,17 +724,6 @@ CREATE POLICY admin_all_rights ON meta_pages TO rsd_admin
 	WITH CHECK (TRUE);
 
 
--- oaipmh
-ALTER TABLE oaipmh ENABLE ROW LEVEL SECURITY;
-
-CREATE POLICY anyone_can_read ON oaipmh FOR SELECT TO rsd_web_anon, rsd_user
-	USING (TRUE);
-
-CREATE POLICY admin_all_rights ON oaipmh TO rsd_admin
-	USING (TRUE)
-	WITH CHECK (TRUE);
-
-
 -- backend logs
 ALTER TABLE backend_log ENABLE ROW LEVEL SECURITY;
 

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -148,7 +148,6 @@ services:
       - ZENODO_ACCESS_TOKEN
       - MAX_REQUESTS_DOI
       - CROSSREF_CONTACT_EMAIL
-      - ENABLE_OAIPMH_SCRAPER
       - LIBRARIES_IO_ACCESS_TOKEN
     depends_on:
       - database

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -164,7 +164,6 @@ services:
       - ZENODO_ACCESS_TOKEN
       - MAX_REQUESTS_DOI
       - CROSSREF_CONTACT_EMAIL
-      - ENABLE_OAIPMH_SCRAPER
       - LIBRARIES_IO_ACCESS_TOKEN
     depends_on:
       - database

diff --git a/e2e/.env.e2e b/e2e/.env.e2e
@@ -106,11 +106,6 @@ MAX_REQUESTS_GITLAB=3
 # consumed by: scrapers
 MAX_REQUESTS_DOI=3
 
-# Fill in any non-empty string to enable the oaipmh scraper.
-# When commented it is disabled.
-# consumed by: scrapers
-# ENABLE_OAIPMH_SCRAPER=True
-
 # ---- SECRETS ------ SECRETS -----------
 
 # consumed by services: database

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -73,18 +73,6 @@ server {
 		proxy_pass http://backend/;
 	}
 
-	location /oaipmh {
-		if ($arg_verb != "ListRecords") {
-			return 404;
-		}
-		if ($arg_metadataPrefix != "datacite4") {
-			return 404;
-		}
-		set $args "";
-		proxy_set_header Accept text/xml;
-		proxy_pass http://backend/oaipmh?select=data;
-	}
-
 	location /swagger/ {
 		proxy_pass http://swagger:8080/;
 	}