Merge branch 'release-0.1.0' into develop

11 files changed, 109 insertions, 16 deletions

diff --git a/config/application.rb b/config/application.rb
index 5d44a94..cad4356 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,7 +15,7 @@ if defined?(Bundler)
   # Bundler.require(:default, :assets, Rails.env)
 end
 
-module LeapWebDemo
+module LeapWeb
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
diff --git a/config/cert b/config/cert
new file mode 100644
index 0000000..27db0fd
--- /dev/null
+++ b/config/cert
@@ -0,0 +1,56 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIFfQIBAAKCATEArnxTeU82frha6g4AchpzAA92ry0PD/FZVK5UiMsbwHfAl/XJ
+udVH0+51DSC5X4p9esftRQNCaJY/4zESe15Sna7aR+FyUoE+LcPpzMpCYH61TUzj
+YLQLzfay6cw1arn                           QC87f3tvmWI7F0zb9KWE9c
+XepnHyr2QJDzMiL   This is an invalid      eOUK8hc+uTReTXpAtD3S3X
+rC3KeJR+jOynTkJ   key block for testing   Sc6Cz2uJBeARNLvTBAj66q
+zfvMIlBOBRCWSQf   please replace with a   IfExunVQnU+xbRx7W9Gg3i
+NV307K4fgLJbY4b   valid client key        Y69SOuXgz7ECsoXy1bWQsi
+TETM5TX/6dADz0z                           FCc8I167mT25s2HNLnZ8AI
+8zqMwDMRf9x7a4GBGmm7n+YSCLy3f8fejw2ZAQIDAQABAoIBMAt3bSQ8Nz3AT20x
+XfEusdn/mGSpq7Co3CprStlr+IaVixpe622FPCNOt0x1RMjR2yrzYkvzC9DZperp
+mWLj7XF3X8FS3gd0Whhl4bS5yZuC8cd7Gq4bx8mGPIwqQzwOXb1mJXt5RPv+zU6X
+J4cSX0GIUBNb1yVsUDouqo1q+saPgBSjhS4xr6sb38XALvzvgVvY/M7YGpSr0Vyv
+ErAwxaGpdk+RppAjcxWBXLuMcIgtU+gSoEogdYzJkoJdwOfcyIllyqlaamcv4T84
+gMWRFncCgZkAzUBt1t3GpuyGVPkD2evtQrBWwg09kx1PAyoNwLDOiarmzUr/euvC
+4W+BfbvmH3Q1dfyQMc/+Y2/LAhvwwkp1F66KsF1xcz6q3FCDN0BGurhIH3rsS1r8
+m+FZ324xLCYXYBDXCwa3B1YsX9d54JuzXzClr+t0xoz5lZzDLgwEEdK9bttGBL0w
+ReIl7KW/TwKDbkPxe+3yCI8CgZkA2aCJUmCtkvaCIX0Udr6g3iyu6lQYbq532/FW
+MNh+KJA3NqXOvGZd9T1DfjlxOqsfGD4H92ekUdy/GdX9SAH4A0RW24gUazNY9N1d
+tdkq8OAxwswquvXC0U5WXsZVp6z1CFawjUiZbW8CgZkAvP9V5SOkN7LWY0pFJJad
+i+oKiXdduqijR/uiXEuyc4v+KQ2lQM/1DEqu0hGKj+enYJtBGPMe+E9+XuZwYMWe
+nsmR1/LNPcM0U3LdOvpviOXv7zNUPyri5sMhjuDFnzMHw1REhsnKqk+XtKJ7yLx9
+I8hiBtKUlBUhietNWEQEnQzxxKMRELaAU+1RFJ7vEVb0JUXFCGPrmbsCgZkAyZrW
+4Zr+GyGz96AetksM5svDVqVed9qzxqPX7/i16F3HmIJKS8lVXLj3TDBJAQTJNhSN
+m+HD6mlClBNzaa2fCTMLtzjAiYhGsRIZbpagCKPRAmcH5bBPSmi+pahBJMBxxdtx
+NdhleRCuWBjM0nBAeYZNkIG3qLegqPaJif4zeJ74QWWsDePox8Xr59C6ev23nUUb
+MnMW7zECgZkAwOOGuqJHyUlsVuErs5c/rLyY0NAqrGoiBp3o5fGnuINzrZSO3zvY
+PcuBeQmnZbkNarfQxFz1ezcf6jmszNStktDj3tFSR8srqpcRKyUPDi1eHD81n8vv
+h1jew1zPRQaQvVZ88p0xacYJeRckbKxcIPGweVqpT9ZJAEGg4J6FFcH+fOIra/7R
+TgLJs443xbTO2GM/25Anc/Pj4bnL2GWqDTurTxANAtmKenuWHTcz47Pm5WNhZP/l
+WWxi9MBzz/80IediLG6qrlU=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAlWgAwIBAgIEUFDq+zANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDEwRU
+RVNUMB4XDTEyMDkxMjIwMDUxNVoXDTEzMDkxMjIwMDUxNVowOjEPMA0GA1UEChMG
+YLQLzfay6cw1arn                           QC87f3tvmWI7F0zb9KWE9c
+XepnHyr2QJDzMiL   This is an invalid      eOUK8hc+uTReTXpAtD3S3X
+rC3KeJR+jOynTkJ   cert block for testing  Sc6Cz2uJBeARNLvTBAj66q
+zfvMIlBOBRCWSQf   please replace with a   IfExunVQnU+xbRx7W9Gg3i
+NV307K4fgLJbY4b   valid server cert       Y69SOuXgz7ECsoXy1bWQsi
+TETM5TX/6dADz0z                           FCc8I167mT25s2HNLnZ8AI
+4GFRwh8TG6dVCdT7FtHHtb0aDeLzOozAMxF/3HtrgYEaabuf5hIIvLd/x96PDZkB
+WAotdJzoLPa4kF4BE0u9MECPrqrN+8wiUE4FEJZJB+/M2WFm+pfZgp1qXx6AL0IC
+AgMBAAGjdjB0MAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDwYD
+VR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUU9Uc5ljBzINN4S6oj80rn+mJTLEwHwYD
+AMCxt8hxLtQlSgfY4MHxlNOE/hepArRQ1KoqW8TZ3DaDZacYuHK6TkarBuVshrAa
+VR0jBBgwFoAU/z1/F2dGNow5Kac+jx7NtyIM0BAwDQYJKoZIhvcNAQELBQADggGX
+TkPLvTbMIeZ/DGC6snrnyspVPVun8X1NcdkqOiSWCt5Y1Li4sClXT+XUFaKES4NS
+SN8LDKX0J+q2n4nRuotaOdq12qs8ZQkMsSI5ueR0soHY1XuSJCK75PFxLJKq3ydm
+FhMVy/bQZgl9QAt7HNK7QoISBmkQFYey0Qq7aotloMhlIyCSN569RcKHdPhZCsCE
+c/YgEkmZwOBR7ypXnT0Tcele120v+qhCRSeoZIEwtm27Dp8+My82fpx7xMKYAHn8
+VhdODq6KZ9Tk8MnYenC7SfiJ/cR0N/Yw5R8Yaa1K5qO+dyIwfXTkTr/Kg97N72jE
+M6lQJXeXaD8sR9wE2nhxKnTJToebjr9mnlgavSsotnzjnm9fMt5CPGOUtG/qGNfB
+GB/GF1HkbZW7VnGWjgNAozftTRCsFoCTwv/ICcW+vYEDVh+hzWjJ/KLl7PruKDPS
+rBlWWdV02QtVKpKYKvynML9kyEX6HeM=
+-----END CERTIFICATE-----
diff --git a/config/deploy.rb b/config/deploy.rb
new file mode 100644
index 0000000..9dc058a
--- /dev/null
+++ b/config/deploy.rb
@@ -0,0 +1,37 @@
+require "bundler/capistrano"
+
+set :application, "webapp"
+
+set :scm, :git
+set :repository,  "git://leap.se/leap_web"
+set :branch, "deploy"
+
+set :deploy_via, :remote_cache
+set :deploy_to, '/home/webapp'
+set :use_sudo, false
+
+set :normalize_asset_timestamps, false
+
+set :user, "webapp"
+
+set :git_enable_submodules, 1  # we're using an srp js submodule for now
+
+role :web, "94.103.43.3"                          # Your HTTP server, Apache/etc
+role :app, "94.103.43.3"                          # 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
diff --git a/config/deploy.rb.example b/config/deploy.rb.example
index 552c820..9e54c22 100644
--- a/config/deploy.rb.example
+++ b/config/deploy.rb.example
@@ -1,10 +1,10 @@
 require "bundler/capistrano"
 
 set :application, "webapp"
-set :repository,  "git://leap.se/leap_web_demo"
 
 set :scm, :git
-# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
+set :repository,  "git://leap.se/leap_web"
+set :branch, "master"
 
 set :deploy_via, :remote_cache
 set :deploy_to, '/home/webapp'
@@ -14,8 +14,10 @@ set :normalize_asset_timestamps, false
 
 set :user, "webapp"
 
-role :web, "YOUR SERVER GOES HERE"                          # Your HTTP server, Apache/etc
-role :app, "YOUR SERVER GOES HERE"                          # This may be the same as your `Web` server
+role :web, "YOUR SERVER"                          # Your HTTP server, Apache/etc
+role :app, "YOUR SERVER"                          # This may be the same as your `Web` server
+
+# We're not using this for now...
 # role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
 # role :db,  "your slave db-server here"
 
diff --git a/config/environment.rb b/config/environment.rb
index 198698d..fe16a54 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-LeapWebDemo::Application.initialize!
+LeapWeb::Application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 19ade85..9ff9476 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-LeapWebDemo::Application.configure do
+LeapWeb::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
diff --git a/config/environments/production.rb b/config/environments/production.rb
index d89379b..d9d37bd 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,4 @@
-LeapWebDemo::Application.configure do
+LeapWeb::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # Code is not reloaded between requests
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b0a542e..1a38df7 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,4 @@
-LeapWebDemo::Application.configure do
+LeapWeb::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 94e038e..23c1aac 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-LeapWebDemo::Application.config.secret_token = '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100'
+LeapWeb::Application.config.secret_token = '550df064dbc5052d9e192b324c1c5a1095c85a2195f88bd6f6829c63b74d8dffa4556494a2e8cc44345a1926be8b6cb17aa4b3f3102d826f5679c3fb57bb7100'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 0c3a729..01dda89 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.
 
-LeapWebDemo::Application.config.session_store = CouchRestSessionStore
+LeapWeb::Application.config.session_store = CouchRestSessionStore
diff --git a/config/routes.rb b/config/routes.rb
index eff6844..3b29251 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
-LeapWebDemo::Application.routes.draw do
+LeapWeb::Application.routes.draw do
+  root :to => "home#index"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
@@ -46,10 +48,6 @@ LeapWebDemo::Application.routes.draw do
   #     resources :products
   #   end
 
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
   # See how all your routes lay out with "rake routes"
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.