[ARVADOS] updated: 02e1074d6020151e9854027df0ca218acb12fa29

[git at public.curoverse.com]

Summary of changes:
 docker/sso/Dockerfile         |  1 +
 docker/sso/application.yml.in | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 docker/sso/application.yml.in

       via  02e1074d6020151e9854027df0ca218acb12fa29 (commit)
      from  b6f54ccb32e05348e9a5c76c7ed3211203cd4e55 (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 02e1074d6020151e9854027df0ca218acb12fa29
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed May 6 17:31:36 2015 -0400

    Fix docker image build for SSO server after refactoring work in #5829.
    
    refs #5829

diff --git a/docker/sso/Dockerfile b/docker/sso/Dockerfile
index 107e4a9..4817bab 100644
--- a/docker/sso/Dockerfile
+++ b/docker/sso/Dockerfile
@@ -9,6 +9,7 @@ RUN git clone git://github.com/curoverse/sso-devise-omniauth-provider.git /usr/s
 # 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/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
new file mode 100644
index 0000000..712ba2c
--- /dev/null
+++ b/docker/sso/application.yml.in
@@ -0,0 +1,26 @@
+#
+# Consult application.default.yml for the full list of configuration
+# settings.
+#
+# The order of precedence is:
+# 1. config/environments/{RAILS_ENV}.rb (deprecated)
+# 2. Section in application.yml corresponding to RAILS_ENV (e.g., development)
+# 3. Section in application.yml called "common"
+# 4. Section in application.default.yml corresponding to RAILS_ENV
+# 5. Section in application.default.yml called "common"
+
+production:
+  allow_account_registration: true
+
+  secret_token: @@SSO_SECRET@@
+  uuid_prefix: 'zzzzz'
+
+development:
+  # No development settings 
+
+test:
+  # No test settings 
+
+common:
+  # No common settings 
+

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


hooks/post-receive
--