check in config file

zhengjia · May 22, 2011 · ca9eaba · ca9eaba
1 parent 02966be
commit ca9eaba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +0,0 @@
-oauth.yml

diff --git a/lib/unwatch.rb b/lib/unwatch.rb
@@ -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
 

diff --git a/oauth.yml b/oauth.yml
@@ -0,0 +1,7 @@
+production:
+  client_id: 
+  secret: 
+
+development:
+  client_id: bc6bc54131c5a1c2e778
+  secret: a601e786aaf74b80ea0f742b331a2c9e934d2529