[ARVADOS] updated: ea7da293b0a10baef18cfc6e107c87a9c3b09546

[git at public.curoverse.com]

Summary of changes:
 docker/sso/Dockerfile         | 2 +-
 docker/sso/application.yml.in | 4 ++++
 docker/sso/secret_token.rb.in | 7 -------
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 docker/sso/secret_token.rb.in

       via  ea7da293b0a10baef18cfc6e107c87a9c3b09546 (commit)
      from  2b43d35b7f1bc94d658203086cb5bd1e6415bc52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ea7da293b0a10baef18cfc6e107c87a9c3b09546
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue May 12 15:12:46 2015 -0400

    Fix sso docker container build, and enable local account creation for
    this sso container uses.
    
    No issue #

diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index 4817bab..7d99ac6 100644
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -7,8 +7,8 @@ RUN git clone git://github.com/curoverse/sso-devise-omniauth-provider.git /usr/s
     /usr/local/rvm/bin/rvm-exec default bundle install --gemfile=/usr/src/sso-provider/Gemfile
 
 # Install generated config files
-ADD generated/secret_token.rb /usr/src/sso-provider/config/initializers/secret_token.rb
 ADD generated/seeds.rb /usr/src/sso-provider/db/seeds.rb
+ADD generated/database.yml /usr/src/sso-provider/config/database.yml
 ADD generated/application.yml /usr/src/sso-provider/config/application.yml
 ADD generated/apache2_vhost /etc/apache2/sites-available/sso-provider
 ADD generated/apache2_vhost /etc/apache2/sites-available/sso-provider
diff --git a/docker/sso/application.yml.in b/docker/sso/application.yml.in
index 712ba2c..6063851 100644
--- a/docker/sso/application.yml.in
+++ b/docker/sso/application.yml.in
@@ -15,6 +15,10 @@ production:
   secret_token: @@SSO_SECRET@@
   uuid_prefix: 'zzzzz'
 
+  # If true, allow new creation of new accounts in the SSO server's internal
+  # user database.
+  allow_account_registration: true
+
 development:
   # No development settings 
 
diff --git a/docker/sso/secret_token.rb.in b/docker/sso/secret_token.rb.in
deleted file mode 100644
index bbe3f85..0000000
--- a/docker/sso/secret_token.rb.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# 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.
-CfiOauthProvider::Application.config.secret_token = '@@SSO_SECRET@@'

-----------------------------------------------------------------------


hooks/post-receive
--