Convert nginx_site to an LWRP

[chef.git] / cookbooks / planet / recipes / default.rb

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 51470380dc47684f04331f2e05355262afc7a1b0..4938936fa7307186ecd3ad14db619340f6363b8e 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -24,16 +24,6 @@ package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
 package "pbzip2"
 package "osmosis"
 

-remote_directory "/usr/local/bin" do
-  source "bin"
-  owner "root"
-  group "root"
-  mode 0755
-  files_owner "root"
-  files_group "root"
-  files_mode 0755
-end
-

 template "/etc/cron.d/planet" do
   source "cron.erb"
   owner "root"
 template "/etc/cron.d/planet" do
   source "cron.erb"
   owner "root"


@@ -61,9 +51,19 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
   files_mode 0755
 end
 

+remote_directory node[:planet][:dump][:xml_history_directory] do
+  source "history_cgi"
+  owner "www-data"
+  group "planet"
+  mode 0755
+  files_owner "root"
+  files_group "root"
+  files_mode 0755
+end
+

 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|
 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|

-  directory dir do
+  directory node[:planet][:dump][dir] do

     owner "www-data"
     group "planet"
     mode 0775
     owner "www-data"
     group "planet"
     mode 0775