[ARVADOS] updated: 0ebc3631838c34c0307fe73beb8e8037b0110bcf

[git at public.curoverse.com]

Summary of changes:
 docker/api/update-gitolite.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

       via  0ebc3631838c34c0307fe73beb8e8037b0110bcf (commit)
      from  34ec4990bb0deaa6c7bef5b9793da3c6836b79e2 (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 0ebc3631838c34c0307fe73beb8e8037b0110bcf
Author: Nico Cesar <nico at curoverse.com>
Date:   Thu Jul 2 10:35:03 2015 -0400

    5989: bug_1 added puppet repository patch
    
    this is duplicated code from:
    
    puppet/modules/arvados-git-server/templates/usr-local-arvados-update-gitolite.rb.erb
    
    I just copy the code that was there

diff --git a/docker/api/update-gitolite.rb b/docker/api/update-gitolite.rb
index a1500e0..1f178cb 100755
--- a/docker/api/update-gitolite.rb
+++ b/docker/api/update-gitolite.rb
@@ -35,6 +35,7 @@ gitolite_arvados_git_user_key = cp_config['gitolite_arvados_git_user_key']
 gitolite_tmpdir = File.join(File.absolute_path(File.dirname(__FILE__)),
                             cp_config['gitolite_tmp'])
 gitolite_admin = File.join(gitolite_tmpdir, 'gitolite-admin')
+gitolite_admin_keydir = File.join(gitolite_admin, 'keydir')
 gitolite_keydir = File.join(gitolite_admin, 'keydir', 'arvados')
 
 ENV['ARVADOS_API_HOST'] = cp_config['arvados_api_host']
@@ -228,10 +229,12 @@ begin
   permissions = arv.repository.get_all_permissions
 
   ensure_directory(gitolite_keydir, 0700)
-  user_ssh_keys = UserSSHKeys.new(permissions[:user_keys], gitolite_keydir)
-  # Make sure the arvados_git_user key is installed
-  user_ssh_keys.install('arvados_git_user.pub', gitolite_arvados_git_user_key)
+  admin_user_ssh_keys = UserSSHKeys.new(permissions[:user_keys], gitolite_admin_keydir)
+  # Make sure the arvados_git_user key is installed; put it in gitolite_admin_keydir
+  # because that is where gitolite will try to put it if we do not.
+  admin_user_ssh_keys.install('arvados_git_user.pub', gitolite_arvados_git_user_key)
 
+  user_ssh_keys = UserSSHKeys.new(permissions[:user_keys], gitolite_keydir)
   permissions[:repositories].each do |repo_record|
     repo = Repository.new(repo_record, user_ssh_keys)
     repo.ensure_config(gitolite_admin)

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


hooks/post-receive
--