Merge branch 'master' of github.com:huacnlee/homeland

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.5'
-gem "bson_ext", "1.3.1"
+gem "bson_ext", "1.4.0"
 gem "mongoid", "2.2.0"
 gem 'carrierwave', '0.5.0'
 gem 'mini_magick','3.3'

Gemfile.lock

@@ -31,8 +31,8 @@ GEM
     addressable (2.2.4)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
     carrierwave (0.5.0)
       activesupport (~> 3.0.0)
@@ -55,8 +55,8 @@ GEM
     mime-types (1.16)
     mini_magick (3.3)
       subexec (~> 0.1.0)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongo-rails-instrumentation (0.2.4)
     mongoid (2.2.0)
       activemodel (~> 3.0)
@@ -110,7 +110,7 @@ GEM
     orm_adapter (0.0.5)
     polyglot (0.3.2)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.2.3)
+    rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-openid (1.3.1)
@@ -155,7 +155,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (= 1.3.1)
+  bson_ext (= 1.4.0)
   carrierwave (= 0.5.0)
   devise (= 1.4.5)
   mini_magick (= 3.3)

config/initializers/carrierwave.rb

@@ -2,5 +2,5 @@
   config.grid_fs_database = Mongoid.database.name
   config.grid_fs_host = '127.0.0.1'
   config.storage = :grid_fs
-  config.grid_fs_access_url = "http://127.0.0.1:3000/uploads"
+  config.grid_fs_access_url = ["http://",Setting.domain,"/l"].join("")
 end

config/thin.yml

@@ -0,0 +1,15 @@
+---
+address: 0.0.0.0
+pid: tmp/pids/thin.pid
+timeout: 30
+port: 7000
+log: log/thin.log
+max_conns: 20480
+require: []
+
+max_persistent_conns: 2048
+environment: production
+servers: 4
+daemonize: true
+chdir: /home/jason/www/homeland
+