X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f30d59e20c5c515986a14c86afbbc7f164ee1eb0..b28584a7d5e39423ed786caab72ac2d0990277b2:/cookbooks/gps-tile/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index 51f0fd411..c3bcfba98 100644
--- 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,13 +33,13 @@ 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
@@ -56,7 +56,7 @@ 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
@@ -73,7 +73,7 @@ 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
@@ -82,25 +82,27 @@ template "/etc/init.d/gps-update" do
   source "update.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 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"
-  mode 0755
+  mode 0o755
   files_owner "gpstile"
   files_group "gpstile"
-  mode 0644
+  files_mode 0o644
 end
 
+apache_module "headers"
+
 apache_site "gps-tile.openstreetmap.org" do
   template "apache.erb"
 end