projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5185: remove the unnecessary test because another test is covering the description...
[arvados.git]
/
docker
/
api
/
update-gitolite.rb
diff --git
a/docker/api/update-gitolite.rb
b/docker/api/update-gitolite.rb
index 779099aac83cf88e2892178da47fa9ca9e39b735..2c46a0d0b5a3c71b8989df9e1c80909fce2830ec 100755
(executable)
--- a/
docker/api/update-gitolite.rb
+++ b/
docker/api/update-gitolite.rb
@@
-4,6
+4,7
@@
require 'rubygems'
require 'pp'
require 'arvados'
require 'active_support/all'
require 'pp'
require 'arvados'
require 'active_support/all'
+require 'yaml'
# This script does the actual gitolite config management on disk.
#
# This script does the actual gitolite config management on disk.
#
@@
-34,6
+35,11
@@
gitolite_admin = File.join(File.expand_path(File.dirname(__FILE__)) + '/' + gito
ENV['ARVADOS_API_HOST'] = cp_config['arvados_api_host']
ENV['ARVADOS_API_TOKEN'] = cp_config['arvados_api_token']
ENV['ARVADOS_API_HOST'] = cp_config['arvados_api_host']
ENV['ARVADOS_API_TOKEN'] = cp_config['arvados_api_token']
+if cp_config['arvados_api_host_insecure']
+ ENV['ARVADOS_API_HOST_INSECURE'] = 'true'
+else
+ ENV.delete('ARVADOS_API_HOST_INSECURE')
+end
keys = ''
keys = ''