projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager
[arvados.git]
/
docker
/
api
/
update-gitolite.rb
diff --git
a/docker/api/update-gitolite.rb
b/docker/api/update-gitolite.rb
index 1623a8b93b02cab6c881fd164ce426c58dd27aea..2c46a0d0b5a3c71b8989df9e1c80909fce2830ec 100755
(executable)
--- a/
docker/api/update-gitolite.rb
+++ b/
docker/api/update-gitolite.rb
@@
-1,13
+1,10
@@
#!/usr/bin/env ruby
#!/usr/bin/env ruby
-###################################################################
-# THIS FILE IS MANAGED BY PUPPET -- CHANGES WILL BE OVERWRITTEN #
-###################################################################
-
require 'rubygems'
require 'pp'
require 'arvados'
require 'active_support/all'
require 'rubygems'
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.
#
@@
-38,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 = ''
@@
-143,12
+145,12
@@
begin
Dir.glob(gitolite_admin + '/keydir/arvados/*.pub') do |key_file|
next if key_file =~ /arvados_git_user.pub$/
next if @seen.has_key?(key_file)
Dir.glob(gitolite_admin + '/keydir/arvados/*.pub') do |key_file|
next if key_file =~ /arvados_git_user.pub$/
next if @seen.has_key?(key_file)
- puts "Extra file #{key_file}"
+ puts "Extra file #{key_file}"
@commit = true
Dir.chdir(gitolite_admin)
key_file.gsub!(/^#{gitolite_admin}\//,'')
`git rm #{key_file}`
@commit = true
Dir.chdir(gitolite_admin)
key_file.gsub!(/^#{gitolite_admin}\//,'')
`git rm #{key_file}`
- end
+ end
if @commit then
message = "#{Time.now().to_s}: update from API"
if @commit then
message = "#{Time.now().to_s}: update from API"