Merge branch 'refs/heads/v1.3-staging' into production

DEPLOYMENT.md

+# Step by Step deployment guide
+
+- [ ] Make sure that the master branch is clean and all commits are pushed to origin
+- [ ] `git checkout stable`
+- [ ] `git merge --no-ff master`
+- [ ] Make sure that the stable branch is clean and all commits are pushed to origin
+- [ ] `git checkout production`
+- [ ] `git checkout $HASHID -- .`
+      The $HASHID being the commit were the last merge from stable happened (before clarindev2clarin.sh changes were committed)
+- [ ] `git merge --no-ff stable`
+- [ ] Change the version number and the registry branch of the images in all deployment yaml files
+- [ ] `git add kubernetes/*deploy*yaml`
+- [ ] `git commit`
+- [ ] `git tag -a $VERSION_NUMBER -s -u $GPG_ID_HASH`
+- [ ] `git push --all
+- [ ] `git push --tags`
+- [ ] `cd dockerfiles`
+- [ ] `./release $VERSION_NUMBER production`
+- [ ] `cd ../kubernetes`
+- [ ] `./stop_kube.sh`
+- [ ] `./start_kube.sh`
+- [ ] `git checkout master`

dockerfiles/commul-customization/default-ssl

@@ -63,7 +63,7 @@ server {
   rewrite ^/repository/oai/?$ $oai_index permanent;
 
   # kept 'redirect' to be sure that this keeps working
-  if ($http_accept ~ "(.*xml.cmdi.*)"){
+  if ($http_accept ~ "(.*cmdi.xml.*)"){
     rewrite ^/(.*)/xmlui/handle/(.*)$ https://$http_host/repository/oai/cite?metadataPrefix=cmdi&handle=$2? redirect;
   }
 

dockerfiles/commul-customization/local.properties

@@ -298,8 +298,8 @@ lr.xmlui.user.showlanguage = false
 ###############################################
 # oai
 #mind the documentation for oai/cite and the respective apache rewrite
-lr.repository.identifier = clarin.eurac.edu 
-lr.repository.sampleIdentifier = oai:clarin.eurac-dev.edu:11858/00-097C-0000-0001-487A-4
+lr.repository.identifier = clarin.eurac.edu
+lr.repository.sampleIdentifier = oai:clarin.eurac.edu:20.500.12124/3
 
 ####
 #

dockerfiles/commul-customization/shibboleth_sp_with_fastcgi.sh

@@ -22,7 +22,7 @@ function get {
 }
 
 get log4shib 1.0.9 http://shibboleth.net/downloads/log4shib/1.0.9/
-get xerces-c 3.2.1 http://mirror.hosting90.cz/apache/xerces/c/3/sources/
+get xerces-c 3.2.2 https://archive.apache.org/dist/xerces/c/3/sources/
 get xml-security-c 1.7.3 https://archive.apache.org/dist/santuario/c-library/
 get xmltooling 1.6.4 http://shibboleth.net/downloads/c++-opensaml/2.6.1/
 get opensaml 2.6.1 http://shibboleth.net/downloads/c++-opensaml/2.6.1/

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/production/dspace:1.3
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3.1
         name: clarin-dspace
         imagePullPolicy: Always
         ports:

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/production/nginx:1.3
+      - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3.1
         imagePullPolicy: Always
         name: clarin-nginx
         ports:

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/production/postgres:1.3
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/postgres:1.3.1
         imagePullPolicy: Always
         name: clarin-postgres
         resources: {}