X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c5c505d5746539d0b3925b5009a393a5f00cff18..a532fdb8f54a5ded5018a06dadf54378077256d4:/cookbooks/web/recipes/rails.rb?ds=inline diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 04bf040c4..f9a061498 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -1,8 +1,8 @@ # -# 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. @@ -17,13 +17,15 @@ # 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") @@ -44,7 +46,7 @@ template "/etc/cron.hourly/passenger" do source "passenger.cron.erb" owner "root" group "root" - mode 0o755 + mode "755" end ruby_version = node[:passenger][:ruby_version] @@ -134,7 +136,7 @@ template "/usr/local/bin/cleanup-rails-assets" do source "cleanup-assets.erb" owner "root" group "root" - mode 0o755 + mode "755" end gem_package "apachelogregex" @@ -144,7 +146,7 @@ template "/usr/local/bin/api-statistics" do source "api-statistics.erb" owner "root" group "root" - mode 0o755 + mode "755" end systemd_service "api-statistics" do