summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-02-08 10:19:15 -0800
committerazul <azul@riseup.net>2013-02-08 10:19:15 -0800
commitead540a95cde2c71a4117cc9839e7cc8f87b46a6 (patch)
tree13724021bb6ebf1a59a3236b27be14a9cc79020c
parent2d8b7b5ea52e73516315d365c51867005b893c0b (diff)
parent00e206c6e51e09cc214119163c3a0b7bc9fef5c7 (diff)
Merge pull request #26 from leapcode/feature/use-couchrest-session-store
Actually use couchrest session store
-rw-r--r--DEPLOY.md3
-rw-r--r--Gemfile1
-rw-r--r--config/initializers/session_store.rb2
-rw-r--r--core/leap_web_core.gemspec2
4 files changed, 4 insertions, 4 deletions
diff --git a/DEPLOY.md b/DEPLOY.md
index 8424c68..8ef2a7a 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -15,8 +15,7 @@ The following packages need to be installed:
### Setup Capistrano ###
-We use capistrano to deploy.
-We ship an example deploy.rb in config/deploy.rb.example. Edit it to match your needs.
+We use puppet to deploy. But we also ship an example deploy.rb in config/deploy.rb.example. Edit it to match your needs if you want to use capistrano.
run `cap deploy:setup` to create the directory structure.
diff --git a/Gemfile b/Gemfile
index 4bf0f3b..13d2f9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,3 +18,4 @@ gem 'ruby-debug', :platforms => :mri_18
# unreleased so far ... but leap_web_certs need it
gem 'certificate_authority', :git => 'git://github.com/cchandler/certificate_authority.git'
+gem 'couchrest_session_store', :git => 'git://github.com/azul/couchrest_session_store.git'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 01dda89..4ae1e21 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file.
-LeapWeb::Application.config.session_store = CouchRestSessionStore
+LeapWeb::Application.config.session_store CouchRestSessionStore
diff --git a/core/leap_web_core.gemspec b/core/leap_web_core.gemspec
index e721637..e3f99d5 100644
--- a/core/leap_web_core.gemspec
+++ b/core/leap_web_core.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.add_dependency "couchrest", "~> 1.1.3"
s.add_dependency "couchrest_model", "~> 2.0.0.beta2"
- s.add_dependency "couchrest_session_store", "~> 0.0.1"
+ s.add_dependency "couchrest_session_store", "~> 0.0.6"
s.add_dependency "json"
end