Merge branch 'master' into stable

CHANGELOG.md

@@ -12,6 +12,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [1.3] - 2018-09-05
+
+### Added
+
+- added robots.txt to the expected place and made sure that sitemap was properly generated (#49)
+- added some python modules to the DSpace Dockerfile that are needed by DSpace healthchecks
+
+### Changed
+
+- adapted some configuration to preserve the real IP addresses of visitors (#35)
+- added configuration to enable DSPace to send Java errors to us by mail
+
+### Fixed
+
+- Made sure that tomcat is stopped with `-force` in entrypoint script to ensure that only one instance is running
+
+## [1.2.2] - 2018-08-31
+
+### Fixed
+
+- Changed the DSpace config to use the production handle prefix and not the staging one
+
 ## [1.2] - 2018-08-27
 
 ### Added
@@ -60,3 +82,5 @@ This is the first release. It all starts here.
 [Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...HEAD
 [1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1
 [1.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...v1.2
+[1.2.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2...v1.2.2
+[1.3]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.2.2...v1.3

dockerfiles/Dockerfile.nginx

@@ -51,7 +51,8 @@ RUN ln -s /opt/nginx/sbin/nginx /usr/sbin/nginx
 COPY commul-customization/webpage/ /opt/nginx/html/
 # copy over robots.txt
 COPY commul-customization/robots.txt /opt/nginx/html/
-RUN chown www-data:www-data /opt/nginx/html/robots.txt
+COPY commul-customization/google4a439c0ac1ac30d0.html /opt/nginx/html/
+RUN chown -R www-data:www-data /opt/nginx/html/
 
 #RUN mkdir /opt/nginx/html/img
 #COPY commul-customization/index.html /opt/nginx/html/

dockerfiles/commul-customization/google4a439c0ac1ac30d0.html

+google-site-verification: google4a439c0ac1ac30d0.html
\ No newline at end of file

dockerfiles/commul-customization/webpage/index.html

@@ -28,7 +28,7 @@
 			<div id="heading">
 				<h1>Welcome to the Eurac Research Clarin Centre!</h1>
 			</div>
-				<img src="images/clarin_ill_1100x375_2.jpg" style="max-width:100%" width="1200" height="410" />				
+				<img src="images/clarin_ill_1100x375_2.png" style="max-width:100%" width="1200" height="410" />				
 		</div>
 		<div id="maintext">
 			<p>The Eurac Research CLARIN Centre (ERCC) is a dedicated repository for language data. It is hosted by the Institute for Applied Linguistics (IAL) at Eurac Research, a private research centre based in Bolzano, South Tyrol. The Centre is part of the Europe-wide CLARIN infrastructure, which means that it follows well-defined international standards for (meta)data and procedures and is well-embedded in the wider European Linguistics infrastructure. The repository hosts data collected at the IAL, but is also open for data deposits from external collaborators.</p>

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