#
-# Cookbook Name:: web
+# Cookbook:: web
# Recipe:: rails
#
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# limitations under the License.
#
-include_recipe "tools"
-include_recipe "web::base"
-
include_recipe "apache"
-include_recipe "passenger"
+include_recipe "apt"
include_recipe "git"
+include_recipe "geoipupdate"
+include_recipe "munin"
include_recipe "nodejs"
+include_recipe "passenger"
+include_recipe "tools"
+include_recipe "web::base"
web_passwords = data_bag_item("web", "passwords")
db_passwords = data_bag_item("db", "passwords")
source "passenger.cron.erb"
owner "root"
group "root"
- mode 0o755
+ mode "755"
end
ruby_version = node[:passenger][:ruby_version]
piwik = data_bag_item("web", "piwik")
storage = {
- "aws" => {
+ "avatars" => {
"service" => "S3",
"access_key_id" => "AKIASQUXHPE7AMJQRFOS",
"secret_access_key" => web_passwords["aws_key"],
"acl" => "public-read",
"cache_control" => "public, max-age=31536000, immutable"
}
+ },
+ "gps_traces" => {
+ "service" => "S3",
+ "access_key_id" => "AKIASQUXHPE7AMJQRFOS",
+ "secret_access_key" => web_passwords["aws_key"],
+ "region" => "eu-west-1",
+ "bucket" => "openstreetmap-gps-traces",
+ "use_dualstack_endpoint" => true,
+ "upload" => {
+ "acl" => "public-read",
+ "cache_control" => "public, max-age=31536000, immutable"
+ }
+ },
+ "gps_images" => {
+ "service" => "S3",
+ "access_key_id" => "AKIASQUXHPE7AMJQRFOS",
+ "secret_access_key" => web_passwords["aws_key"],
+ "region" => "eu-west-1",
+ "bucket" => "openstreetmap-gps-images",
+ "use_dualstack_endpoint" => true,
+ "upload" => {
+ "acl" => "public-read",
+ "cache_control" => "public, max-age=31536000, immutable"
+ }
}
}
email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
status node[:web][:status]
messages_domain "messages.openstreetmap.org"
- gpx_dir "/store/rails/gpx"
- attachments_dir "/store/rails/attachments"
log_path "#{node[:web][:log_directory]}/rails.log"
logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"
memcache_servers node[:web][:memcached_servers]
potlatch2_key web_passwords["potlatch2_key"]
id_key web_passwords["id_key"]
oauth_key web_passwords["oauth_key"]
+ oauth_application web_passwords["oauth_application"]
piwik_configuration "location" => piwik[:location],
"site" => piwik[:site],
"goals" => piwik[:goals].to_hash
trace_use_job_queue true
diary_feed_delay 12
storage_configuration storage
- storage_service "aws"
- storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
+ avatar_storage "avatars"
+ trace_file_storage "gps_traces"
+ trace_image_storage "gps_images"
+ trace_icon_storage "gps_images"
+ avatar_storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
+ trace_image_storage_url "https://openstreetmap-gps-images.s3.dualstack.eu-west-1.amazonaws.com"
+ overpass_url "https://query.openstreetmap.org/query-features"
end
+gem_package "bundler#{ruby_version}" do
+ package_name "bundler"
+ gem_binary "gem#{ruby_version}"
+ options "--format-executable"
+end
+
+bundle = if File.exist?("/usr/bin/bundle#{ruby_version}")
+ "/usr/bin/bundle#{ruby_version}"
+ else
+ "/usr/local/bin/bundle#{ruby_version}"
+ end
+
systemd_service "rails-jobs@" do
description "Rails job queue runner"
type "simple"
environment "RAILS_ENV" => "production", "QUEUE" => "%I"
user "rails"
working_directory rails_directory
- exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work"
+ exec_start "#{bundle} exec rake jobs:work"
restart "on-failure"
private_tmp true
private_devices true
source "cleanup-assets.erb"
owner "root"
group "root"
- mode 0o755
+ mode "755"
end
gem_package "apachelogregex"
source "api-statistics.erb"
owner "root"
group "root"
- mode 0o755
+ mode "755"
end
systemd_service "api-statistics" do