From 1b9ea430d16e007f7db71847a2bd691ccf68579b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Mar 2017 18:42:58 +0000
Subject: [PATCH] Make the publisher URL configurable, with no default

---
 app/views/layouts/_head.html.erb | 4 +++-
 config/example.application.yml   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 7b16aa6ae..377d55e9d 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -25,7 +25,9 @@
   <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") }) %>
   <%= tag("meta", { :name => "theme-color", :content => "#ffffff" }) %>
   <%= canonical_tag %>
-  <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>
+  <% if defined?(PUBLISHER_URL) -%>
+  <%= tag("link", { :rel => "publisher", :href => PUBLISHER_URL }) %>
+  <% end -%>
   <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") }) %>
   <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
   <%= opengraph_tags(@title) %>
diff --git a/config/example.application.yml b/config/example.application.yml
index 567458c90..a10563f61 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -2,6 +2,8 @@ defaults: &defaults
   # The server protocol and host
   server_protocol: "http"
   server_url: "openstreetmap.example.com"
+  # Publisher
+  #publisher_url: ""
   # The generator
   generator: "OpenStreetMap server"
   copyright_owner: "OpenStreetMap and contributors"
-- 
2.43.2