X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/19aeb7bfffb852ab8be005c004b1ef8e555a5b77..e4a0595002f1f428a98776070ad4677b6433b46f:/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 315865ac9..b960143e7 100644 --- a/cookbooks/gps-tile/recipes/default.rb +++ b/cookbooks/gps-tile/recipes/default.rb @@ -1,14 +1,14 @@ # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,7 +17,10 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" +include_recipe "git" +include_recipe "memcached" package %w[ make @@ -40,15 +43,16 @@ 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 @@ -112,6 +118,7 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do end apache_module "headers" +apache_module "rewrite" ssl_certificate "gps-tile.openstreetmap.org" do domains ["gps-tile.openstreetmap.org",