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 8609f95f5ee183d5f5070dedf6af25919872ff58..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.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache"
+include_recipe "apache::ssl"

 
 package "make"
 package "build-essential"
 
 package "make"
 package "build-essential"


@@ -33,13 +33,13 @@ package "libcache-memcached-perl"
 directory "/srv/gps-tile.openstreetmap.org" do
   owner "gpstile"
   group "gpstile"
 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"
 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
   user "gpstile"
   group "gpstile"
 end


@@ -56,7 +56,7 @@ end
 git "/srv/gps-tile.openstreetmap.org/datamaps" do
   action :sync
   repository "git://github.com/ericfischer/datamaps.git"
 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
   user "gpstile"
   group "gpstile"
 end


@@ -73,7 +73,7 @@ end
 git "/srv/gps-tile.openstreetmap.org/updater" do
   action :sync
   repository "git://github.com/ericfischer/gpx-updater.git"
 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
   user "gpstile"
   group "gpstile"
 end


@@ -82,23 +82,23 @@ template "/etc/init.d/gps-update" do
   source "update.init.erb"
   owner "root"
   group "root"
   source "update.init.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 end
 

-#service "gps-update" do
-#  action [ :enable, :start ]
-#  supports :restart => true
-#  subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]"
-#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"
 
 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_owner "gpstile"
   files_group "gpstile"

-  files_mode 0644
+  files_mode 0o644

 end
 
 apache_module "headers"
 end
 
 apache_module "headers"