second part of the merge

dockerfiles/commul-customization/nginx.default.conf

@@ -6,7 +6,7 @@ upstream tomcats {
 server {
   listen 443;
   listen [::]:443;
-  server_name clarin-dev.eurac.edu localhost;
+  server_name clarin.eurac.edu localhost;
 
   root  /opt/nginx/html;
 

dockerfiles/commul-customization/shibboleth2.xml

@@ -23,7 +23,7 @@
     -->
     <RequestMapper type="XML">
     <RequestMap>
-        <Host name="clarin-dev.eurac.edu"
+        <Host name="clarin.eurac.edu"
             authType="shibboleth"
             requireSession="true"
             exportAssertion="true"
@@ -35,7 +35,7 @@
 </RequestMapper>
 
     <!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
-    <ApplicationDefaults entityID="https://clarin-dev.eurac.edu/Shibboleth.sso/Metadata"
+    <ApplicationDefaults entityID="https://clarin.eurac.edu/Shibboleth.sso/Metadata"
         REMOTE_USER="eppn persistent-id targeted-id"
         sessionHook="/php/aa-statistics.php"
         cipherSuites="ECDHE+AESGCM:ECDHE:!aNULL:!eNULL:!LOW:!EXPORT:!RC4:!SHA:!SSLv2">

kubernetes/dspace-deployment.yaml

@@ -56,7 +56,7 @@ spec:
             secretKeyRef:
               key: mail.pass
               name: dspace-secrets
-        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3.4-RC6
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3.4
         name: clarin-dspace
         imagePullPolicy: Always
         ports:
@@ -73,7 +73,7 @@ spec:
             command:
               - /bin/sh
               - -c
-              - reply=$(curl -s -o /dev/null -w %{http_code} https://clarin-dev.eurac.edu/repository/xmlui/); if [ "$reply" -lt 200 -o "$reply" -ge 400 ]; then exit 1; fi; ps aux | grep -v grep | grep -E "sleep|timeout" && exit 0 || exit 1;
+              - reply=$(curl -s -o /dev/null -w %{http_code} https://clarin.eurac.edu/repository/xmlui/); if [ "$reply" -lt 200 -o "$reply" -ge 400 ]; then exit 1; fi; ps aux | grep -v grep | grep -E "sleep|timeout" && exit 0 || exit 1;
           initialDelaySeconds: 900
           periodSeconds: 15
           timeoutSeconds: 3

kubernetes/dspace-ingress.yaml

@@ -40,5 +40,5 @@ spec:
         path: /
   tls:
   - hosts:
-    - clarin-dev.eurac.edu
-    secretName: clarin-dev-eurac-edu-tls
+    - clarin.eurac.edu
+    secretName: clarin-eurac-edu-tls

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.4-RC6
+      - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3.4
         imagePullPolicy: Always
         name: clarin-nginx
         ports:
@@ -60,7 +60,7 @@ spec:
 =======
         - name: nginx-ssl-certs
           secret:
-            secretName: clarin-dev-eurac-edu-tls
+            secretName: clarin-eurac-edu-tls
 >>>>>>> stable
         - cephfs:
             monitors:

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