diff --git a/CHANGELOG.md b/CHANGELOG.md index 66fa83ea1d180e396e751439635e63fac3357785..540401599ee837f356936ff3aba4bde4b55e4e59 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/dockerfiles/Dockerfile.nginx b/dockerfiles/Dockerfile.nginx index f69dabe58bf74dd81aec116c3c2f8c6104097ebb..888debf3414540f0d36266437ec838800e68d70c 100644 --- a/dockerfiles/Dockerfile.nginx +++ b/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/ diff --git a/dockerfiles/commul-customization/google4a439c0ac1ac30d0.html b/dockerfiles/commul-customization/google4a439c0ac1ac30d0.html new file mode 100644 index 0000000000000000000000000000000000000000..b384381eb1b0756ab561d730587be4355107a53e --- /dev/null +++ b/dockerfiles/commul-customization/google4a439c0ac1ac30d0.html @@ -0,0 +1 @@ +google-site-verification: google4a439c0ac1ac30d0.html \ No newline at end of file diff --git a/dockerfiles/commul-customization/webpage/images/clarin_ill_1100x375_2.png b/dockerfiles/commul-customization/webpage/images/clarin_ill_1100x375_2.png new file mode 100644 index 0000000000000000000000000000000000000000..cf91737ebefce659e4dc12d3bfa23efd5676c9a9 Binary files /dev/null and b/dockerfiles/commul-customization/webpage/images/clarin_ill_1100x375_2.png differ diff --git a/dockerfiles/commul-customization/webpage/index.html b/dockerfiles/commul-customization/webpage/index.html index 322c5a8e124636bc6dc69c96ddbb81a32b973c72..717e6967173a1d1e5f2d637d630b7f21b6118255 100644 --- a/dockerfiles/commul-customization/webpage/index.html +++ b/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> diff --git a/kubernetes/dspace-deployment.yaml b/kubernetes/dspace-deployment.yaml index 9f994ebf87739be5a9b0e973aafbb2d3da4f8426..eaad5fe34ff8558a2662d330277b98a24a9c702f 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-RC1 + image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3-RC2 name: clarin-dspace imagePullPolicy: Always ports: diff --git a/kubernetes/nginx-deployment.yaml b/kubernetes/nginx-deployment.yaml index 0d166e2a6d91d7a58961817e0093f78048b66487..94bc4069ec80626d0e311dfb5ffeb036f1f40903 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-RC1 + - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.3-RC2 imagePullPolicy: Always name: clarin-nginx ports: diff --git a/kubernetes/postgres-deployment.yaml b/kubernetes/postgres-deployment.yaml index 8be0395341470f8d3b34dc8d90c02f179d500ae1..b382a004770985174b555320b9093f61c3b67853 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-RC1 + image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.3-RC2 imagePullPolicy: Always name: clarin-postgres resources: {}