Permalink
Browse files

check in config file

  • Loading branch information...
1 parent 02966be commit ca9eaba7d176289728ccb5b4e5eca03724a0a3b1 @zhengjia committed May 22, 2011
Showing with 11 additions and 4 deletions.
  1. +0 −1 .gitignore
  2. +4 −3 lib/unwatch.rb
  3. +7 −0 oauth.yml
View
@@ -1 +0,0 @@
-oauth.yml
View
@@ -11,11 +11,12 @@ class Unwatch < Sinatra::Base
set :secret, ENV['secret']
else
config = YAML::load(File.open('oauth.yml'))
- set :client_id, config['client_id']
- set :secret, config['secret']
+ set :client_id, config['development']['client_id']
+ set :secret, config['development']['secret']
end
enable :sessions unless test?
- enable :static
+ set :static, true
+ set :public, 'public'
set :session_secret, "unwatch" # shotgun bug
end
View
@@ -0,0 +1,7 @@
+production:
+ client_id:
+ secret:
+
+development:
+ client_id: bc6bc54131c5a1c2e778
+ secret: a601e786aaf74b80ea0f742b331a2c9e934d2529

0 comments on commit ca9eaba

Please sign in to comment.