Only cleanup rails temporary directory if it exists

[chef.git] / cookbooks / gps-tile / recipes / default.rb

diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index ab524abcc5ce1c9de098cb289cd43c79c248e815..c3bcfba9874a4e1d94ff59c05783ebcabcb40675 100644 (file)
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 
 package "make"
 package "build-essential"
@@ -33,21 +33,21 @@ package "libcache-memcached-perl"
 directory "/srv/gps-tile.openstreetmap.org" do
   owner "gpstile"
   group "gpstile"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/gps-tile.openstreetmap.org/import" do
   action :sync
   repository "git://github.com/ericfischer/gpx-import.git"
-  revision "master"
+  revision "live"
   user "gpstile"
   group "gpstile"
 end
 
-execute "import-make" do
+execute "/srv/gps-tile.openstreetmap.org/import/src/Makefile" do
   action :nothing
   command "make"
-  cwd "/srv/gps-tile.openstreetmap.org/import"
+  cwd "/srv/gps-tile.openstreetmap.org/import/src"
   user "gpstile"
   group "gpstile"
   subscribes :run, "git[/srv/gps-tile.openstreetmap.org/import]"
@@ -56,12 +56,12 @@ end
 git "/srv/gps-tile.openstreetmap.org/datamaps" do
   action :sync
   repository "git://github.com/ericfischer/datamaps.git"
-  revision "master"
+  revision "live"
   user "gpstile"
   group "gpstile"
 end
 
-execute "datamaps-make" do
+execute "/srv/gps-tile.openstreetmap.org/datamaps/Makefile" do
   action :nothing
   command "make"
   cwd "/srv/gps-tile.openstreetmap.org/datamaps"
@@ -73,13 +73,36 @@ end
 git "/srv/gps-tile.openstreetmap.org/updater" do
   action :sync
   repository "git://github.com/ericfischer/gpx-updater.git"
-  revision "master"
+  revision "live"
   user "gpstile"
   group "gpstile"
 end
 
-directory "/srv/gps-tile.openstreetmap.org/html" do
+template "/etc/init.d/gps-update" do
+  source "update.init.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+service "gps-update" do
+  action [:enable, :start]
+  supports :restart => true, :status => true
+  subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]"
+end
+
+remote_directory "/srv/gps-tile.openstreetmap.org/html" do
+  source "html"
   owner "gpstile"
   group "gpstile"
-  mode 0755
+  mode 0o755
+  files_owner "gpstile"
+  files_group "gpstile"
+  files_mode 0o644
+end
+
+apache_module "headers"
+
+apache_site "gps-tile.openstreetmap.org" do
+  template "apache.erb"
 end