Merge branch 'release'

Buckinghamshire-Digital-Service · Oct 6, 2023 · b178dbe · b178dbe
2 parents bd24a2c + 9c7a779
commit b178dbe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 69.8 (2023-10-06)
+
+Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/69.7...69.8>
+
+- [Fixes for Google spam issue](https://git.torchbox.com/buckinghamshire-council/bc/-/merge_requests/665)
+
 ## 69.7 (2023-09-21)
 
 Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/69.6...69.7>

diff --git a/Dockerfile b/Dockerfile
@@ -111,10 +111,7 @@ FROM backend as dev
 # Swap user, so the following tasks can be run as root
 USER root
 
-# Update stretch repositories
-RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
-    -e 's|security.debian.org|archive.debian.org/|g' \
-    -e '/stretch-updates/d' /etc/apt/sources.list
+# Update apt repositories
 RUN apt-get update --yes --quiet
 
 # Install node (Keep the version in sync with the node container above)

diff --git a/bc/project_styleguide/templates/patterns/base.html b/bc/project_styleguide/templates/patterns/base.html
@@ -17,7 +17,7 @@
             search engines crawling admin domains.:8000
             This ignores ports for simplicity.
         {% endcomment %}
-        {% if request.get_host != current_site.hostname or request.get_host in NONINDEXED_HOSTS %}
+        {% if request.get_host != current_site.hostname or request.get_host in NONINDEXED_HOSTS or SEO_NOINDEX %}
             <meta name="robots" content="noindex" />
         {% endif %}
 

diff --git a/bc/search/views.py b/bc/search/views.py
@@ -195,6 +195,7 @@ def get(self, request, *args, **kwargs):
                 "no_result_text": no_result_text,
                 "search_query": search_query,
                 "search_results": search_results,
+                "SEO_NOINDEX": True,
             }
         )
 

diff --git a/public/robots.txt b/public/robots.txt
@@ -1,3 +1,2 @@
 User-Agent: *
-Disallow: /search/
 Allow: /