Merge branch 'master' into stable

clarin-dev2clarin.sh

@@ -10,7 +10,7 @@ perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/aai_config.
 perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/aa-statistics.php
 perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml
 perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/webpage/index.html
-perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/commul-customization/robots.txt
+perl -pi -e 's/clarin-dev/clarin/g' dockerfiles/Dockerfile.nginx
 
 # adapt URL and prefix for handle server
 perl -pi -e 's/20.500.12084/20.500.12124/g' dockerfiles/commul-customization/config.dct

dockerfiles/Dockerfile.nginx

@@ -50,7 +50,7 @@ RUN ln -s /opt/nginx/sbin/nginx /usr/sbin/nginx
 # copy over static html
 COPY commul-customization/webpage/ /opt/nginx/html/
 # copy over robots.txt
-COPY commul-customization/robots.txt /opt/nginx/html/
+COPY commul-customization/robots-clarin-dev.txt /opt/nginx/html/robots.txt
 COPY commul-customization/google4a439c0ac1ac30d0.html /opt/nginx/html/
 RUN chown -R www-data:www-data /opt/nginx/html/
 

dockerfiles/commul-customization/robots-clarin-dev.txt

+User-agent: *
+# Disable access
+Disallow: /