Permalink
Browse files

Some fixes for production

  • Loading branch information...
1 parent 8a07f05 commit 2e0214cf86e85ba91c575b5f07874ec33ddbd082 @airhorns committed Jan 31, 2012
Showing with 6 additions and 56 deletions.
  1. +2 −3 Gemfile
  2. +0 −49 Gemfile.lock
  3. +4 −4 config.ru
View
5 Gemfile
@@ -6,6 +6,8 @@ gem 'compass', '0.10.6'
gem 'haml', '3.0.25'
gem 'tilt'
gem 'rack-codehighlighter', :require => 'rack/codehighlighter'
+gem "rack-nocache"
+#gem "evergreen", :git => "git@github.com:hornairs/evergreen.git", :submodules => true
# Ultraviolet. God what a pain.
gem 'plist', :git => "git://github.com/spox/plist.git"
@@ -18,11 +20,8 @@ group :production do
end
group :development, :test do
- gem 'unicorn'
gem 'guard'
gem 'guard-coffeescript'
gem 'guard-compass'
gem 'growl'
- gem "rack-nocache"
- gem "evergreen", :git => "git@github.com:hornairs/evergreen.git", :submodules => true
end
View
49 Gemfile.lock
@@ -18,45 +18,20 @@ GIT
textpow (0.10.3)
spox-plist
-GIT
- remote: git@github.com:hornairs/evergreen.git
- revision: 021fedea5841d3997fe5a8bb9710520ef9045027
- submodules: true
- specs:
- evergreen (0.4.0)
- capybara (~> 0.4.0)
- json_pure (>= 1.0.0)
- launchy (>= 0.3.5)
- sinatra (>= 1.1)
-
GEM
remote: http://rubygems.org/
specs:
builder (3.0.0)
- capybara (0.4.1.2)
- celerity (>= 0.7.9)
- culerity (>= 0.2.4)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (>= 0.0.27)
- xpath (~> 0.1.3)
- celerity (0.8.9)
- childprocess (0.1.9)
- ffi (~> 1.0.6)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.1)
compass (0.10.6)
haml (>= 3.0.4)
- culerity (0.2.15)
daemons (1.1.4)
eventmachine (0.12.10)
execjs (1.2.0)
multi_json (~> 1.0)
- ffi (1.0.9)
growl (1.0.3)
guard (0.5.1)
thor (~> 0.14.6)
@@ -67,10 +42,6 @@ GEM
compass (>= 0.10.5)
guard (>= 0.2.1)
haml (3.0.25)
- json_pure (1.5.3)
- kgio (2.6.0)
- launchy (2.0.3)
- mime-types (1.16)
multi_json (1.0.3)
newrelic_rpm (3.1.0)
nokogiri (1.5.0)
@@ -80,19 +51,7 @@ GEM
rack (>= 1.0.0)
rack-nocache (0.1.0)
rack-rewrite (1.0.2)
- rack-test (0.6.0)
- rack (>= 1.0)
- raindrops (0.7.0)
rdiscount (1.6.8)
- rubyzip (0.9.4)
- selenium-webdriver (2.1.0)
- childprocess (>= 0.1.9)
- ffi (>= 1.0.7)
- json_pure
- rubyzip
- sinatra (1.2.6)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
spox-plist (3.0.1)
spox-textpow (0.10.3)
spox-plist
@@ -106,19 +65,12 @@ GEM
builder
rack
rdiscount
- unicorn (4.0.1)
- kgio (~> 2.4)
- rack
- raindrops (~> 0.6)
- xpath (0.1.4)
- nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
compass (= 0.10.6)
- evergreen!
growl
guard
guard-coffeescript
@@ -134,4 +86,3 @@ DEPENDENCIES
tilt
toto (= 0.4.9)
ultraviolet!
- unicorn
View
8 config.ru
@@ -17,9 +17,9 @@ use Rack::Codehighlighter,
unless ENV['RACK_ENV'] == 'production'
use Rack::ShowExceptions
use Rack::Nocache
- map "/evergreen" do
- run Evergreen::Suite.new(File.dirname(__FILE__)).application
- end
+ #map "/evergreen" do
+ #run Evergreen::Suite.new(File.dirname(__FILE__)).application
+ #end
else
use Rack::Rewrite do
r301 %r{.*}, 'http://harry.me$&', :if => Proc.new {|rack_env|
@@ -36,7 +36,7 @@ toto = Toto::Server.new do
set :author, "Harry Brundage" # blog author
set :title, "Will You Harry Me?" # site title
unless ENV['RACK_ENV'] == 'production'
- set :url, 'http://localhost:8080'
+ set :url, 'http://localhost:3000'
else
set :url, 'http://harry.me' # site root URL
end

0 comments on commit 2e0214c

Please sign in to comment.