Fix duplicate resource names

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 28bf482735766231596f8d1dfa345e9483fa9b32..a0c95714e82394202b06b84e6a8fd0f5a1a20c3d 100644 (file)
--- 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 ea32ef5af3032b213b50bd92c0351830e0bbf27b..44f1d6e59752be039b7f94876bd7386cbe542154 100644 (file)
--- 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"