diff --git a/dockerfiles/commul-customization/default-ssl b/dockerfiles/commul-customization/default-ssl index 25d34260315ee26fa1f618741d49017fc4592e64..8cf746c3967dabc2cc18b21d289258d767731204 100644 --- a/dockerfiles/commul-customization/default-ssl +++ b/dockerfiles/commul-customization/default-ssl @@ -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; } diff --git a/kubernetes/dspace-deployment.yaml b/kubernetes/dspace-deployment.yaml index eaad5fe34ff8558a2662d330277b98a24a9c702f..80254a9db4dc1e3159924207f3988027c0222175 100644 --- a/kubernetes/dspace-deployment.yaml +++ b/kubernetes/dspace-deployment.yaml @@ -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: diff --git a/kubernetes/nginx-deployment.yaml b/kubernetes/nginx-deployment.yaml index 94bc4069ec80626d0e311dfb5ffeb036f1f40903..b0dbd4aeeb1ef0068c7692ed12089d4b5fb7a675 100644 --- a/kubernetes/nginx-deployment.yaml +++ b/kubernetes/nginx-deployment.yaml @@ -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: diff --git a/kubernetes/postgres-deployment.yaml b/kubernetes/postgres-deployment.yaml index b382a004770985174b555320b9093f61c3b67853..91f5bed9a898733720b6495d0e770fe5bd9a8635 100644 --- a/kubernetes/postgres-deployment.yaml +++ b/kubernetes/postgres-deployment.yaml @@ -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: {}