X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..87daa0d823c8f92eda8190f2d9b482b3d85a7a0c:/cookbooks/gps-tile/recipes/default.rb diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb index 565ddc2e1..21a515034 100644 --- a/cookbooks/gps-tile/recipes/default.rb +++ b/cookbooks/gps-tile/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: gps-tile +# Cookbook:: gps-tile # Recipe:: default # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,10 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" +include_recipe "git" +include_recipe "memcached" package %w[ make @@ -35,20 +38,21 @@ package %w[ directory "/srv/gps-tile.openstreetmap.org" do owner "gpstile" group "gpstile" - mode 0o755 + mode "755" end git "/srv/gps-tile.openstreetmap.org/import" do action :sync - repository "git://github.com/ericfischer/gpx-import.git" + repository "https://github.com/ericfischer/gpx-import.git" revision "live" + depth 1 user "gpstile" group "gpstile" end execute "/srv/gps-tile.openstreetmap.org/import/src/Makefile" do action :nothing - command "make" + command "make DB=none LDFLAGS=-lm" cwd "/srv/gps-tile.openstreetmap.org/import/src" user "gpstile" group "gpstile" @@ -57,8 +61,9 @@ end git "/srv/gps-tile.openstreetmap.org/datamaps" do action :sync - repository "git://github.com/ericfischer/datamaps.git" + repository "https://github.com/ericfischer/datamaps.git" revision "live" + depth 1 user "gpstile" group "gpstile" end @@ -74,8 +79,9 @@ end git "/srv/gps-tile.openstreetmap.org/updater" do action :sync - repository "git://github.com/ericfischer/gpx-updater.git" + repository "https://github.com/ericfischer/gpx-updater.git" revision "live" + depth 1 user "gpstile" group "gpstile" end @@ -105,10 +111,10 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do source "html" owner "gpstile" group "gpstile" - mode 0o755 + mode "755" files_owner "gpstile" files_group "gpstile" - files_mode 0o644 + files_mode "644" end apache_module "headers"