diff --git a/.idea/misc.xml b/.idea/misc.xml
index 837e448..7b0a6c8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,23 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
diff --git a/.idea/omniauth.iml b/.idea/omniauth.iml
index 8451c3c..a46a664 100644
--- a/.idea/omniauth.iml
+++ b/.idea/omniauth.iml
@@ -23,7 +23,7 @@
-
+
@@ -31,16 +31,16 @@
-
+
-
+
-
+
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5561e96..8197f63 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,15 @@
-
+
-
+
+
@@ -34,88 +35,88 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -132,7 +133,6 @@
@@ -182,7 +186,6 @@
-
@@ -233,6 +236,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -325,12 +346,13 @@
+
-
+
@@ -589,6 +611,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
@@ -598,18 +637,18 @@
-
+
-
+
-
+
@@ -689,112 +728,108 @@
-
+
-
-
-
+
-
+
-
+
-
+
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/Capfile b/Capfile
new file mode 100644
index 0000000..6a798eb
--- /dev/null
+++ b/Capfile
@@ -0,0 +1,4 @@
+load 'deploy'
+# Uncomment if you are using Rails' asset pipeline
+ # load 'deploy/assets'
+load 'config/deploy' # remove this line to skip loading any of the default tasks
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 9ad254b..caf4db3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,8 @@ gem 'jbuilder', '~> 1.0.1'
gem 'omniauth'
gem 'omniauth-openid'
+gem 'execjs'
+
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 54092eb..dd6ab74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 0.3.33)
arel (4.0.0)
- atomic (1.1.12)
+ atomic (1.1.13)
builder (3.1.4)
coffee-rails (4.0.0)
coffee-script (>= 2.2.0)
@@ -38,9 +38,9 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- hashie (2.0.3)
+ hashie (2.0.5)
hike (1.2.3)
- i18n (0.6.4)
+ i18n (0.6.5)
jbuilder (1.0.2)
activesupport (>= 3.0.0)
jquery-rails (3.0.4)
@@ -50,9 +50,9 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.23)
+ mime-types (1.24)
minitest (4.7.5)
- multi_json (1.7.8)
+ multi_json (1.7.9)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
rack
@@ -118,6 +118,7 @@ PLATFORMS
DEPENDENCIES
coffee-rails (~> 4.0.0.beta1)
+ execjs
jbuilder (~> 1.0.1)
jquery-rails
omniauth
diff --git a/config/deploy.rb b/config/deploy.rb
new file mode 100644
index 0000000..d966ea9
--- /dev/null
+++ b/config/deploy.rb
@@ -0,0 +1,43 @@
+default_run_options[:pty] = true
+
+set :application, "omniauth"
+set :repository, "https://pghodgman@github.com/pghodgman/omniauth.git"
+set :branch, "master"
+set :scm, :git
+
+set :deploy_to, "/var/www/apps/#{application}"
+
+
+# The address of the remote host on EC2 (the Public DNS address)
+set :location, "ec2-23-22-160-105.compute-1.amazonaws.com"
+# setup some Capistrano roles
+role :app, location
+role :web, location
+role :db, location, :primary => true
+
+# Set up SSH so it can connect to the EC2 node - assumes your SSH key is in ~/.ssh/id_rsa
+set :user, "ec2-user"
+ssh_options[:keys] = [File.join(ENV["HOME"], "pubkeys", "aws-ec2.pem")]
+
+# set :scm, :git # You can set :scm explicitly or Capistrano will make an intelligent guess based on known version control directory names
+# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
+
+#role :web, "your web-server here" # Your HTTP server, Apache/etc
+#role :app, "your app-server here" # This may be the same as your `Web` server
+#role :db, "your primary db-server here", :primary => true # This is where Rails migrations will run
+#role :db, "your slave db-server here"
+
+# if you want to clean up old releases on each deploy uncomment this:
+# after "deploy:restart", "deploy:cleanup"
+
+# if you're still using the script/reaper helper you will need
+# these http://github.com/rails/irs_process_scripts
+
+# If you are using Passenger mod_rails uncomment this:
+# namespace :deploy do
+# task :start do ; end
+# task :stop do ; end
+# task :restart, :roles => :app, :except => { :no_release => true } do
+# run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
+# end
+# end
\ No newline at end of file