Merge branch 'master' into 2221-complete-docker

[arvados.git] / docker / config.rb

diff --git a/docker/config.rb b/docker/config.rb
index 547a2548abf7918e789a2084a250d2b62382f0c5..ae69fe29eceb2f51fb87efc0d1e91069b3d98c77 100755 (executable)
--- a/docker/config.rb
+++ b/docker/config.rb
@@ -1,6 +1,9 @@
 #! /usr/bin/env ruby
 
 require 'yaml'
+require 'fileutils'
+
+abort 'Error: Ruby >= 1.9.3 required.' if RUBY_VERSION < '1.9.3'
 
 # Initialize config settings from config.yml
 config = YAML.load_file('config.yml')
@@ -9,12 +12,6 @@ config = YAML.load_file('config.yml')
 # Add dynamically chosen config settings. These settings should
 # be suitable for any installation.
 
-# The APP_SECRET the application uses (with OMNIAUTH_APP_ID) to
-# authenticate itself to Omniauth. By default this is generated
-# randomly when the application is built; you can instead
-# substitute a hardcoded string.
-config['OMNIAUTH_APP_SECRET'] = rand(2**512).to_s(36)
-
 # Any _PW/_SECRET config settings represent passwords/secrets. If they
 # are blank, choose a password randomly.
 config.each_key do |var|
@@ -63,3 +60,12 @@ Dir.glob('*/*.in') do |template_file|
   end
   output.close
 end
+
+# Copy the ssh public key file to base/generated (if a path is given)
+generated_dir = File.join('base/generated')
+Dir.mkdir(generated_dir) unless Dir.exists? generated_dir
+if (config['PUBLIC_KEY_PATH'] != nil and
+    File.readable? config['PUBLIC_KEY_PATH'])
+  FileUtils.cp(config['PUBLIC_KEY_PATH'],
+               File.join(generated_dir, 'id_rsa.pub'))
+end