Skip to content

Commit

Permalink
update gemfile.lock
Browse files Browse the repository at this point in the history
update procfile
update config & db for prod
  • Loading branch information
isaacchansky committed Nov 18, 2014
1 parent ddfb1b9 commit bd03c40
Showing 5 changed files with 4 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ gem 'datamapper'
gem 'dm-postgres-adapter'
gem 'pg'
gem 'icalendar'
gem 'thin'

gem 'dotenv-rails', :groups => [:development, :test]
gem 'dotenv-rails'

group :development do
gem 'thin'
gem 'shotgun'
gem "minitest"
end
4 changes: 0 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -62,9 +62,6 @@ GEM
dotenv (= 0.11.1)
eventmachine (1.0.3)
fastercsv (1.5.5)
http (0.6.2)
http_parser.rb (~> 0.6.0)
http_parser.rb (0.6.0)
icalendar (2.1.1)
json (1.8.1)
json_pure (1.8.1)
@@ -108,7 +105,6 @@ DEPENDENCIES
datamapper
dm-postgres-adapter
dotenv-rails
http
icalendar
json
minitest
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

2 changes: 1 addition & 1 deletion app/app.rb
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ class Agora < Sinatra::Application
config_file("config.yml")

# Set up DB
DataMapper.setup(:default, "#{ENV['DB_ADAPTER']}://#{ENV['DB_HOSTNAME']}/#{ENV['DB_NAME']}")
DataMapper.setup(:default, ENV['DATABASE_URL'] || "#{ENV['DB_ADAPTER']}://#{ENV['DB_HOSTNAME']}/#{ENV['DB_NAME']}")

Event.auto_upgrade!
Source.auto_upgrade!
7 changes: 1 addition & 6 deletions config.ru
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
require File.join(File.dirname(__FILE__), 'app/app.rb')

map "/public" do
run Rack::Directory.new("./app/public")
end

require './app/app'
run Agora.new

0 comments on commit bd03c40

Please sign in to comment.