From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Oct 2016 21:44:14 +0000 (+0100)
Subject: Fix duplicate resource names
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/bb4ae7ccbf8069443f3ef88156e4c3a2b0c648c2

Fix duplicate resource names
---

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 28bf48273..a0c95714e 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -33,7 +33,8 @@ file "/etc/cron.d/planet" do
   action :delete
 end
 
-remote_directory "/store/planet" do
+remote_directory "/store/planet#html" do
+  path "/store/planet"
   source "html"
   owner "root"
   group "root"
@@ -43,7 +44,8 @@ remote_directory "/store/planet" do
   files_mode 0o644
 end
 
-remote_directory "/store/planet" do
+remote_directory "/store/planet#cgi" do
+  path "/store/planet"
   source "cgi"
   owner "root"
   group "root"
diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index ea32ef5af..44f1d6e59 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -93,7 +93,7 @@ directory "/store/planetdump" do
   mode 0o755
 end
 
-["planetdump", "planet-mirror-redirect-update", "apache-latest-planet-filename"].each do |program|
+["planetdump", "planet-mirror-redirect-update"].each do |program|
   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"