Skip to content
Snippets Groups Projects
Commit cf3995d3 authored by Alexander König's avatar Alexander König
Browse files

Merge branch 'master' into stable

parents 8ab0c4fd 5732c6b7
Branches
Tags
No related merge requests found
......@@ -49,18 +49,20 @@ server {
add_header 'Access-Control-Allow-Credentials' 'true';
# redirect different legacy forms to repository/xmlui
rewrite ^/xmlui(.*)$ /repository/xmlui$1 redirect;
rewrite ^/repository.?$ /repository/xmlui/ redirect;
rewrite ^/solr(.*)$ /repository/solr$1 redirect;
rewrite ^/handle/(.*)$ /repository/xmlui/handle/$1 redirect;
# changed 'redirect' to 'permanent'
rewrite ^/xmlui(.*)$ /repository/xmlui$1 permanent;
rewrite ^/repository.?$ /repository/xmlui/ permanent;
rewrite ^/solr(.*)$ /repository/solr$1 permanent;
rewrite ^/handle/(.*)$ /repository/xmlui/handle/$1 permanent;
set $oai_index /repository/oai/request?verb=Identify;
rewrite ^/oai$ $oai_index redirect;
rewrite ^/oai$ $oai_index permanent;
location /oai {
return 301 https://$http_host/repository$request_uri;
}
rewrite ^/repository/oai$ $oai_index redirect;
rewrite ^/repository/oai/?$ $oai_index permanent;
# kept 'redirect' to be sure that this keeps working
if ($http_accept ~ "(.*xml.cmdi.*)"){
rewrite ^/(.*)/xmlui/handle/(.*)$ https://$http_host/repository/oai/cite?metadataPrefix=cmdi&handle=$2? redirect;
}
......
......@@ -50,7 +50,7 @@ spec:
secretKeyRef:
key: mail.pass
name: dspace-secrets
image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3-RC2
image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3-RC6
name: clarin-dspace
imagePullPolicy: Always
ports:
......
......@@ -20,7 +20,7 @@ spec:
io.kompose.service: nginx
spec:
containers:
- image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.3-RC2
- image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.3-RC6
imagePullPolicy: Always
name: clarin-nginx
ports:
......
......@@ -48,7 +48,7 @@ spec:
secretKeyRef:
key: dspace.utils.name
name: dspace-secrets
image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.3-RC2
image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.3-RC6
imagePullPolicy: Always
name: clarin-postgres
resources: {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment