clarin-dev2clarin.sh

@@ -11,8 +11,7 @@ perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/clarin.eura
 perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/webpage/index.html 
 
 # adapt URL and prefix for handle server
-perl -pi -e 's/20.500.12084/20.500.12124/g' dockerfiles/Dockerfile.dspace
-perl -pi -e 's/193.106.181.73/193.106.181.70/g' dockerfiles/Dockerfile.dspace
+perl -pi -e 's/20.500.12084/20.500.12124/g' dockerfiles/commul-customization/config.dct
 
 # adapt shib SP ID
 perl -pi -e 's/_5d15d5a81bc952da1d34986ebc7713c0d5c9ea61/_5d15d5a81bc952da1d34986ebc7713c0d5c9ea91/g' dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml
@@ -20,3 +19,7 @@ perl -pi -e 's/_5d15d5a81bc952da1d34986ebc7713c0d5c9ea61/_5d15d5a81bc952da1d3498
 # adapt hostname in docker-compose
 perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/docker-compose.yml
 echo "Modified all files to point to clarin.eurac.edu instead of clarin-dev.eurac.edu."
+
+# adapt namespace in kubernetes yaml files
+sed -i 's/dspace-dev/dspace/' kubernetes/*.yaml 
+perl -pi -e 's/clarin-dev/clarin/g' kubernetes/dspace-ingress.yaml

dockerfiles/Dockerfile.dspace

@@ -52,18 +52,21 @@ COPY commul-customization/tomcat-server.xml /opt/tomcat8/conf/server.xml
 
 # install Dspace
 # pre-fetch maven dependencies
-COPY commul-customization/dspace-pom.xml /tmp/pom.xml
-WORKDIR /tmp/
-# RUN mvn dependency:resolve
-RUN mvn -B -T 4 dependency:copy-dependencies dependency:resolve-plugins dependency:go-offline  clean
+RUN git clone https://github.com/commul/clarin-dspace.git -b commul-custom /opt/repository/sources/dspace
+WORKDIR /opt/repository/sources/dspace
+RUN mvn compile
+#COPY commul-customization/dspace-pom.xml /tmp/pom.xml
+#WORKDIR /tmp/
+## RUN mvn dependency:resolve
+#RUN mvn -B -T 4 dependency:copy-dependencies dependency:resolve-plugins dependency:go-offline  clean
 # all files could be copied into a /tmp folder within the container first (maybe that could be mounted?); see also dspace-entrypoint.sh
 # this checks if there was a new commit since the last build
-ADD https://api.github.com/repos/commul/clarin-dspace/git/refs/heads/commul-custom version.json
-RUN git clone https://github.com/commul/clarin-dspace.git -b commul-custom /opt/repository/sources/dspace
+ADD https://api.github.com/repos/commul/clarin-dspace/git/refs/heads/commul-custom /tmp/version.json
+RUN git pull
 WORKDIR /opt/repository/sources/dspace/utilities/project_helpers
 RUN ./setup.sh /opt/repository/workspace
 COPY commul-customization/variable.makefile /opt/repository/workspace/config/variable.makefile
-COPY commul-customization/dspace.cfg /opt/repository/sources/dspace/dspace/config/dspace.cfg
+# COPY commul-customization/dspace.cfg /opt/repository/sources/dspace/dspace/config/dspace.cfg
 
 # copy over configs and startup scripts
 COPY commul-customization/start_stack.sh /opt/repository/workspace/scripts/

dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml

@@ -29,6 +29,9 @@
                 <mdui:PrivacyStatementURL xml:lang="en">https://clarin.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
                 <mdui:PrivacyStatementURL xml:lang="de">https://clarin.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
                 <mdui:PrivacyStatementURL xml:lang="it">https://clarin.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
+                <mdui:PrivacyStatementURL xml:lang="en">https://clarin.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
+                <mdui:PrivacyStatementURL xml:lang="de">https://clarin.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
+                <mdui:PrivacyStatementURL xml:lang="it">https://clarin.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
             </mdui:UIInfo>          
         </md:Extensions>
         <md:AttributeConsumingService index="1">

dockerfiles/commul-customization/default-ssl

 upstream tomcats {
-                    server dspace:8009;
-                    keepalive 10;
-            }
+    server dspace:8009;
+    keepalive 10;
+}
 
 server {
     listen 80;
     listen [::]:80;
     server_name clarin.eurac.edu;
-#   return 301 https://$server_name$request_uri;
+
+    location /repository/oai {
+
+        client_body_buffer_size 32K;
+
+        client_max_body_size 4G;
+
+        sendfile on;
+        send_timeout 300s;
+
+        ajp_keep_conn on;
+        ajp_pass tomcats;
+
+    }
+
+    location / {
+        return 301 https://$server_name$request_uri;
+    }
 }
 
 server {

dockerfiles/commul-customization/local.properties

@@ -15,12 +15,12 @@ lr.pid.service.testPid =
 # multiple configurations can be given separated by semicolon
 # default configuration should have asterisk as the community ID
 # subprefix is only used for local handles
-lr.pid.community.configurations = community=*,prefix=20.500.12124,type=local,canonical_prefix=http://hdl.handle.net/
+lr.pid.community.configurations = community=*,prefix=20.500.12084,type=local,canonical_prefix=http://hdl.handle.net/
 # if true, PID metadata will be filled with object metadata like title
 lr.pid.resolvemetadata = true
 
 handle.canonical.prefix = http://hdl.handle.net/
-handle.prefix = 20.500.12124 
+handle.prefix = 20.500.12084 
 handle.dir=${dspace.dir}/handle-server
 
 lr.reserve.pid.on.start = false
@@ -133,7 +133,8 @@ mail.extraproperties = mail.smtp.starttls.enable=true
 # Eurac IAL: Contact information
 lr.help.mail = clarin@eurac.edu
 lr.help.phone = +39 0471 055 129
-mail.from.address = lindat.mail@unibz.it
+mail.from.address = ${MAIL_USER}
+mail.replyto.address = noreply@scientificnet.org
 mail.feedback.recipient = clarin@eurac.edu
 info.recipient = clarin@eurac.edu
 mail.alert.recipient = ${mail.admin}
@@ -297,7 +298,7 @@ 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.edu:11858/00-097C-0000-0001-487A-4
+lr.repository.sampleIdentifier = oai:clarin.eurac-dev.edu:11858/00-097C-0000-0001-487A-4
 
 ####
 #

kubernetes/dspace-deployment.yaml

@@ -50,9 +50,9 @@ spec:
             secretKeyRef:
               key: mail.pass
               name: dspace-secrets
-        image: gitlab.scientificnet.org:4567/commul/dspace/dspace-image:1.0
+        image: gitlab.scientificnet.org:4567/commul/dspace/dspace-image:1.1
         name: clarin-dspace
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         ports:
         - containerPort: 8009
         - containerPort: 8080

kubernetes/dspace-ingress.yaml

@@ -4,10 +4,18 @@ metadata:
   annotations:
     ingress.kubernetes.io/add-base-url: "true"
     ingress.kubernetes.io/ssl-passthrough: "true"
+    ingress.kubernetes.io/ssl-redirect: "false"
   name: dspace-ingress
   namespace: dspace
 spec:
   rules:
+  - host: clarin.eurac.edu
+    http:
+      paths:
+      - backend:
+          serviceName: nginx
+          servicePort: 80
+        path: /repository/oai
   - host: clarin.eurac.edu
     http:
       paths:

kubernetes/nginx-deployment.yaml

@@ -20,8 +20,8 @@ spec:
         io.kompose.service: nginx
     spec:
       containers:
-      - image: gitlab.scientificnet.org:4567/commul/dspace/nginx-image:1.0
-        imagePullPolicy: IfNotPresent
+      - image: gitlab.scientificnet.org:4567/commul/dspace/nginx-image:1.1
+        imagePullPolicy: Always
         name: clarin-nginx
         ports:
         - containerPort: 80

kubernetes/postgres-deployment.yaml

@@ -48,7 +48,7 @@ spec:
             secretKeyRef:
               key: dspace.utils.name
               name: dspace-secrets
-        image: gitlab.scientificnet.org:4567/commul/dspace/postgres-image:1.0
+        image: gitlab.scientificnet.org:4567/commul/dspace/postgres-image:1.1
         imagePullPolicy: Always
         name: clarin-postgres
         resources: {}