From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Apr 2016 21:36:34 +0000 (+0100)
Subject: Use file URLs when merging replication diffs
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c3b7d202cd2e99de4577a2b1ab7ca34508928511?ds=sidebyside

Use file URLs when merging replication diffs

This avoids relying on a working web server for the merging and
shoud generally be a more efficient way to do it.
---

diff --git a/cookbooks/planet/templates/default/replication.config.erb b/cookbooks/planet/templates/default/replication.config.erb
index 7ac5ac58a..759ad9f24 100644
--- a/cookbooks/planet/templates/default/replication.config.erb
+++ b/cookbooks/planet/templates/default/replication.config.erb
@@ -1,7 +1,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # The URL of the directory containing change files.
-baseUrl=http://planet.openstreetmap.org/replication/<%= @base %>
+baseUrl=file:///store/planet/replication/<%= @base %>
 
 # The length of an extraction interval in seconds (3600 = 1 hour).
 intervalLength=<%= @interval %>