Fix mailer domains. Fix projects import script. Refs #2261

This commit is contained in:
Pavel Chipiga 2011-11-22 15:01:33 +02:00
parent 42713dd9b9
commit 1cbd725e14
3 changed files with 5 additions and 4 deletions

View File

@ -41,7 +41,6 @@ module Rosa
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
config.action_mailer.default_url_options = { :host => 'abs.rosalab.ru' }
config.action_mailer.default_url_options = { :host => 'npp-build.rosalab.ru' }
end
end

View File

@ -3,8 +3,8 @@ APP_CONFIG = YAML.load_file("#{Rails.root}/config/application.yml")[Rails.env]
# Setup Smart HTTP GRack
require 'grack'
config = {:project_root => File.join(APP_CONFIG['root_path'], 'git_projects'), :git_path => '/opt/local/bin/git', :upload_pack => true, :receive_pack => true}
Rosa::Application.config.middleware.insert_before 0, ::Grack::Handler, config
# Rosa::Application.config.middleware.insert_after ::Rails::Rack::Logger, ::Grack::Handler, config
# Rosa::Application.config.middleware.insert_before 0, ::Grack::Handler, config
Rosa::Application.config.middleware.insert_after ::Rails::Rack::Logger, ::Grack::Handler, config
Rosa::Application.config.middleware.insert_before ::Grack::Handler, ::Grack::Auth
# Grit::Git.git_timeout = 60

View File

@ -1,3 +1,5 @@
require 'open-uri'
namespace :import do
desc "Load projects"
task :projects => :environment do