Commit 7ad46c9e889ee305381d08951817a93d04fbc157
Exists in
master
and in
1 other branch
Merge branch 'master' of https://github.com/benlangfeld/errbit into benlangfeld_master
Showing
2 changed files
with
8 additions
and
19 deletions
Show diff stats
config/deploy.example.rb
... | ... | @@ -6,6 +6,8 @@ |
6 | 6 | # `cap deploy` whenever you would like to deploy Errbit. Refer |
7 | 7 | # to the Readme for more information. |
8 | 8 | |
9 | +require 'bundler/capistrano' | |
10 | + | |
9 | 11 | set :application, "errbit" |
10 | 12 | set :repository, "http://github.com/jdpace/errbit.git" |
11 | 13 | |
... | ... | @@ -29,7 +31,7 @@ set :scm_verbose, true |
29 | 31 | set(:current_branch) { `git branch`.match(/\* (\S+)\s/m)[1] || raise("Couldn't determine current branch") } |
30 | 32 | set :branch, defer { current_branch } |
31 | 33 | |
32 | -after 'deploy:update_code', 'errbit:symlink_configs', 'bundler:install' | |
34 | +after 'deploy:update_code', 'errbit:symlink_configs' | |
33 | 35 | |
34 | 36 | namespace :deploy do |
35 | 37 | task :start do ; end |
... | ... | @@ -39,19 +41,6 @@ namespace :deploy do |
39 | 41 | end |
40 | 42 | end |
41 | 43 | |
42 | -namespace :bundler do | |
43 | - task :symlink_vendor, :roles => :app, :except => { :no_release => true } do | |
44 | - shared_gems = File.join(shared_path,'vendor','bundler_gems') | |
45 | - release_gems = "#{latest_release}/vendor/" | |
46 | - run("mkdir -p #{shared_gems} && ln -nfs #{shared_gems} #{release_gems}") | |
47 | - end | |
48 | - | |
49 | - task :install, :rolse => :app do | |
50 | - bundler.symlink_vendor | |
51 | - run("cd #{release_path} && bundle install vendor/bundler_gems --without development test") | |
52 | - end | |
53 | -end | |
54 | - | |
55 | 44 | namespace :errbit do |
56 | 45 | task :setup_configs do |
57 | 46 | shared_configs = File.join(shared_path,'config') | ... | ... |
config/mongoid.example.yml
... | ... | @@ -26,8 +26,8 @@ test: |
26 | 26 | # set these environment variables on your prod server |
27 | 27 | production: |
28 | 28 | <<: *defaults |
29 | - host: <%= ENV['MONGOID_HOST'] %> | |
30 | - port: <%= ENV['MONGOID_PORT'] %> | |
31 | - username: <%= ENV['MONGOID_USERNAME'] %> | |
32 | - password: <%= ENV['MONGOID_PASSWORD'] %> | |
33 | - database: <%= ENV['MONGOID_DATABASE'] %> | |
34 | 29 | \ No newline at end of file |
30 | + host: localhost | |
31 | + port: 27018 | |
32 | + username: errbit | |
33 | + password: | |
34 | + database: errbit | |
35 | 35 | \ No newline at end of file | ... | ... |