X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8b15f39477a8246b3aff1eaee870379639ecec5f..1d1e4a446f80877ce43264a916ddb245e641d35c:/cookbooks/web/definitions/rails_port.rb?ds=sidebyside diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 205695c08..c23587dd9 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -69,53 +69,10 @@ define :rails_port, :action => [:create, :enable] do recursive true end - file "#{rails_directory}/tmp/restart.txt" do - action :nothing - end - - file "#{rails_directory}/public/export/embed.html" do - action :nothing - end - - execute "#{rails_directory}/public/assets" do - action :nothing - command "rake#{ruby_version} assets:precompile" - environment "RAILS_ENV" => "production" - cwd rails_directory - user rails_user - group rails_group - notifies :delete, "file[#{rails_directory}/public/export/embed.html]" - notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" - end - - execute "#{rails_directory}/db/migrate" do - action :nothing - command "rake#{ruby_version} db:migrate" - cwd rails_directory - user rails_user - group rails_group - notifies :run, "execute[#{rails_directory}/public/assets]" - end - - execute "#{rails_directory}/Gemfile" do - action :nothing - command "bundle#{ruby_version} install" - cwd rails_directory - user "root" - group "root" - environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes" - if run_migrations - notifies :run, "execute[#{rails_directory}/db/migrate]" - else - notifies :run, "execute[#{rails_directory}/public/assets]" - end - subscribes :run, "gem_package[bundler#{ruby_version}]" - end - directory rails_directory do owner rails_user group rails_group - mode 02775 + mode 0o2775 end git rails_directory do @@ -125,6 +82,9 @@ define :rails_port, :action => [:create, :enable] do user rails_user group rails_group notifies :run, "execute[#{rails_directory}/Gemfile]" + notifies :run, "execute[#{rails_directory}/public/assets]" + notifies :delete, "file[#{rails_directory}/public/export/embed.html]" + notifies :run, "execute[#{rails_directory}]" end directory "#{rails_directory}/tmp" do @@ -142,9 +102,9 @@ define :rails_port, :action => [:create, :enable] do source "database.yml.erb" owner rails_user group rails_group - mode 0664 + mode 0o664 variables database_params - notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" + notifies :run, "execute[#{rails_directory}]" end application_yml = edit_file "#{rails_directory}/config/example.application.yml" do |line| @@ -167,14 +127,6 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#quova_password:.*$/, "\\1quova_password: \"#{params[:quova_password]}\"") end - if params[:soft_memory_limit] - line.gsub!(/^( *)#soft_memory_limit:.*$/, "\\1soft_memory_limit: #{params[:soft_memory_limit]}") - end - - if params[:hard_memory_limit] - line.gsub!(/^( *)#hard_memory_limit:.*$/, "\\1hard_memory_limit: #{params[:hard_memory_limit]}") - end - if params[:gpx_dir] line.gsub!(/^( *)gpx_trace_dir:.*$/, "\\1gpx_trace_dir: \"#{params[:gpx_dir]}/traces\"") line.gsub!(/^( *)gpx_image_dir:.*$/, "\\1gpx_image_dir: \"#{params[:gpx_dir]}/images\"") @@ -188,8 +140,12 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#log_path:.*$/, "\\1log_path: \"#{params[:log_path]}\"") end + if params[:logstash_path] + line.gsub!(/^( *)#logstash_path:.*$/, "\\1logstash_path: \"#{params[:logstash_path]}\"") + end + if params[:memcache_servers] - line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join("\", \"")}\" ]") + line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join('", "')}\" ]") end if params[:potlatch2_key] @@ -208,6 +164,39 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"") end + if params[:osrm_url] + line.gsub!(/^( *)osrm_url:.*$/, "\\1osrm_url: \"#{params[:osrm_url]}\"") + end + + if params[:google_auth_id] + line.gsub!(/^( *)#google_auth_id:.*$/, "\\1google_auth_id: \"#{params[:google_auth_id]}\"") + line.gsub!(/^( *)#google_auth_secret:.*$/, "\\1google_auth_secret: \"#{params[:google_auth_secret]}\"") + line.gsub!(/^( *)#google_openid_realm:.*$/, "\\1google_openid_realm: \"#{params[:google_openid_realm]}\"") + end + + if params[:facebook_auth_id] + line.gsub!(/^( *)#facebook_auth_id:.*$/, "\\1facebook_auth_id: \"#{params[:facebook_auth_id]}\"") + line.gsub!(/^( *)#facebook_auth_secret:.*$/, "\\1facebook_auth_secret: \"#{params[:facebook_auth_secret]}\"") + end + + if params[:windowslive_auth_id] + line.gsub!(/^( *)#windowslive_auth_id:.*$/, "\\1windowslive_auth_id: \"#{params[:windowslive_auth_id]}\"") + line.gsub!(/^( *)#windowslive_auth_secret:.*$/, "\\1windowslive_auth_secret: \"#{params[:windowslive_auth_secret]}\"") + end + + if params[:github_auth_id] + line.gsub!(/^( *)#github_auth_id:.*$/, "\\1github_auth_id: \"#{params[:github_auth_id]}\"") + line.gsub!(/^( *)#github_auth_secret:.*$/, "\\1github_auth_secret: \"#{params[:github_auth_secret]}\"") + end + + if params[:mapquest_key] + line.gsub!(/^( *)#mapquest_key:.*$/, "\\1mapquest_key: \"#{params[:mapquest_key]}\"") + end + + if params[:mapzen_valhalla_key] + line.gsub!(/^( *)#mapzen_valhalla_key:.*$/, "\\1mapzen_valhalla_key: \"#{params[:mapzen_valhalla_key]}\"") + end + line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true") line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true") @@ -217,16 +206,16 @@ define :rails_port, :action => [:create, :enable] do file "#{rails_directory}/config/application.yml" do owner rails_user group rails_group - mode 0664 + mode 0o664 content application_yml - notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" + notifies :run, "execute[#{rails_directory}/public/assets]" end if params[:piwik_configuration] file "#{rails_directory}/config/piwik.yml" do owner rails_user group rails_group - mode 0664 + mode 0o664 content YAML.dump(params[:piwik_configuration]) notifies :run, "execute[#{rails_directory}/public/assets]" end @@ -237,6 +226,42 @@ define :rails_port, :action => [:create, :enable] do end end + execute "#{rails_directory}/Gemfile" do + action :nothing + command "bundle#{ruby_version} install" + cwd rails_directory + user "root" + group "root" + environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes" + subscribes :run, "gem_package[bundler#{ruby_version}]" + notifies :run, "execute[#{rails_directory}]" + end + + execute "#{rails_directory}/db/migrate" do + action :nothing + command "bundle#{ruby_version} exec rake db:migrate" + cwd rails_directory + user rails_user + group rails_group + subscribes :run, "git[#{rails_directory}]" + notifies :run, "execute[#{rails_directory}]" + only_if { run_migrations } + end + + execute "#{rails_directory}/public/assets" do + action :nothing + command "bundle#{ruby_version} exec rake assets:precompile" + environment "RAILS_ENV" => "production" + cwd rails_directory + user rails_user + group rails_group + notifies :run, "execute[#{rails_directory}]" + end + + file "#{rails_directory}/public/export/embed.html" do + action :nothing + end + execute "#{rails_directory}/lib/quad_tile/extconf.rb" do command "ruby extconf.rb" cwd "#{rails_directory}/lib/quad_tile" @@ -256,15 +281,23 @@ define :rails_port, :action => [:create, :enable] do File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") && File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h") end - notifies :touch, "file[#{rails_directory}/tmp/restart.txt]" + notifies :run, "execute[#{rails_directory}]" + end + + execute rails_directory do + action :nothing + command "passenger-config restart-app --ignore-app-not-running #{rails_directory}" + user "root" + group "root" + only_if { File.exist?("/usr/bin/passenger-config") } end - template "/etc/cron.daily/rails-#{name}" do + template "/etc/cron.daily/rails-#{name.tr('.', '-')}" do cookbook "web" source "rails.cron.erb" owner "root" group "root" - mode 0755 + mode 0o755 variables :directory => rails_directory end end