From 1ae877538c5bebf22270b55e806af2ec7536a581 Mon Sep 17 00:00:00 2001
From: Brett Smith <brett@curoverse.com>
Date: Mon, 24 Nov 2014 15:53:44 -0500
Subject: [PATCH] 4027: Bugfix update-gitolite.rb in Docker.
* Load a YAML library.
* Support ARVADOS_API_HOST_INSECURE, and set it in normal Docker use.
---
docker/api/arvados-clients.yml.in | 1 +
docker/api/update-gitolite.rb | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/docker/api/arvados-clients.yml.in b/docker/api/arvados-clients.yml.in
index babfc4e5c9..59ff352a18 100644
--- a/docker/api/arvados-clients.yml.in
+++ b/docker/api/arvados-clients.yml.in
@@ -3,3 +3,4 @@ production:
gitolite_tmp: 'gitolite-tmp'
arvados_api_host: 'api'
arvados_api_token: '@@API_SUPERUSER_SECRET@@'
+ arvados_api_host_insecure: true
diff --git a/docker/api/update-gitolite.rb b/docker/api/update-gitolite.rb
index 779099aac8..2c46a0d0b5 100755
--- 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 'yaml'
# 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']
+if cp_config['arvados_api_host_insecure']
+ ENV['ARVADOS_API_HOST_INSECURE'] = 'true'
+else
+ ENV.delete('ARVADOS_API_HOST_INSECURE')
+end
keys = ''
--
2.30.2