From: Tom Hughes <tom@compton.nu>
Date: Fri, 24 Mar 2017 00:00:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/118'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/016c7dfacda321c44808f179a0ec4e66954336cc?hp=bf14fbaf495ff6aa406ad95aa39ac81fd00549e5

Merge remote-tracking branch 'github/pull/118'
---

diff --git a/cookbooks/dev/templates/default/apache.rails.erb b/cookbooks/dev/templates/default/apache.rails.erb
index 4eab0d2ee..e431cf1a1 100644
--- a/cookbooks/dev/templates/default/apache.rails.erb
+++ b/cookbooks/dev/templates/default/apache.rails.erb
@@ -19,6 +19,10 @@
         RailsEnv production
 
         SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
+
+        # Ensure robots do not index dev site
+        # https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+        Header set X-Robots-Tag "noindex, nofollow"
 </VirtualHost>
 
 <VirtualHost *:80>
@@ -33,6 +37,10 @@
 
         RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
         RedirectPermanent / https://<%= @name %>/
+
+        # Ensure robots do not index dev site
+        # https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+        Header set X-Robots-Tag "noindex, nofollow"
 </VirtualHost>
 
 <Directory /srv/<%= @name %>/public>