X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/24fad2e3a1db5e8cc8efd4c95581ecbef88d2758..4687a5bf9faa00f2ff3a14545cdd58a65a65ab8d:/cookbooks/web/definitions/rails_port.rb?ds=inline diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 1a57b7927..c23587dd9 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -72,7 +72,7 @@ define :rails_port, :action => [:create, :enable] do directory rails_directory do owner rails_user group rails_group - mode 02775 + mode 0o2775 end git rails_directory do @@ -102,7 +102,7 @@ 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 :run, "execute[#{rails_directory}]" end @@ -145,7 +145,7 @@ define :rails_port, :action => [:create, :enable] do 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] @@ -164,6 +164,10 @@ 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]}\"") @@ -180,6 +184,11 @@ define :rails_port, :action => [:create, :enable] do 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 @@ -197,7 +206,7 @@ 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 :run, "execute[#{rails_directory}/public/assets]" end @@ -206,7 +215,7 @@ define :rails_port, :action => [:create, :enable] do 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 @@ -230,7 +239,7 @@ define :rails_port, :action => [:create, :enable] do execute "#{rails_directory}/db/migrate" do action :nothing - command "bundle#{ruby_version} exec rake#{ruby_version} db:migrate" + command "bundle#{ruby_version} exec rake db:migrate" cwd rails_directory user rails_user group rails_group @@ -241,7 +250,7 @@ define :rails_port, :action => [:create, :enable] do execute "#{rails_directory}/public/assets" do action :nothing - command "bundle#{ruby_version} exec rake#{ruby_version} assets:precompile" + command "bundle#{ruby_version} exec rake assets:precompile" environment "RAILS_ENV" => "production" cwd rails_directory user rails_user @@ -277,18 +286,18 @@ define :rails_port, :action => [:create, :enable] do execute rails_directory do action :nothing - command "passenger-config restart-app #{rails_directory}" + 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