Fix push over http

Author: root

Diff for: app/views/settings/redmine_git_hosting/_gitolite_config_storage.html.haml

@@ -3,6 +3,7 @@
 - gitolite_redmine_storage_dir = RedmineGitHosting::Config.get_setting(:gitolite_redmine_storage_dir)
 - gitolite_recycle_bin_dir     = RedmineGitHosting::Config.get_setting(:gitolite_recycle_bin_dir)
 - gitolite_local_code_dir      = RedmineGitHosting::Config.get_setting(:gitolite_local_code_dir)
+- gitolite_lib_dir             = RedmineGitHosting::Config.get_setting(:gitolite_lib_dir)
 
 %h3= l(:label_gitolite_storage_config)
 
@@ -34,3 +35,9 @@
       = l(:label_gitolite_local_code_dir_desc) + ','
       = link_to 'Gitolite non-core programs', 'http://gitolite.com/gitolite/non-core.html#localcode', target: 'blank'
       )
+
+%p
+  %label= l(:label_gitolite_lib_dir)
+  = text_field_tag 'settings[gitolite_lib_dir]', gitolite_lib_dir, size: 60
+  %br
+  %em= l(:label_gitolite_lib_dir_desc)

Diff for: init.rb

@@ -27,6 +27,7 @@
       :gitolite_redmine_storage_dir   => '',
       :gitolite_recycle_bin_dir       => 'recycle_bin/',
       :gitolite_local_code_dir        => 'local/',
+      :gitolite_lib_dir               => 'bin/lib/',
 
       # Gitolite Config File
       :gitolite_config_file              => 'gitolite.conf',

Diff for: lib/grack/auth.rb

@@ -39,7 +39,7 @@ def auth!
           @user = authenticate_user(login, password)
 
           if @user
-            @env['REMOTE_USER'] = @auth.username
+            @env['REMOTE_USER'] = @user.gitolite_identifier
           end
         end
 

Diff for: lib/grack/server.rb

@@ -156,13 +156,23 @@ def git_command_with_chdir
 
 
       def smart_http_args
-        ['env', 'GL_BYPASS_UPDATE_HOOK=true']
+        [
+          'env',
+          "GL_LIBDIR=#{RedmineGitHosting::Config.gitolite_lib_dir_path}",
+          "GL_REPO=#{repository_object.gitolite_repository_name}",
+          "GL_USER=#{@env['REMOTE_USER']}"
+        ]
       end
 
 
       def logger
         RedmineGitHosting.logger
       end
 
+
+      def repository_object
+        @repo ||= Repository::Xitolite.find_by_path(@dir, loose: true)
+      end
+
   end
 end

Diff for: lib/redmine_git_hosting/config/gitolite_base.rb

@@ -23,6 +23,20 @@ def gitolite_home_dir
       end
 
 
+      def gitolite_lib_dir
+        RedmineGitHosting::Config.get_setting(:gitolite_lib_dir)
+      end
+
+
+      def gitolite_lib_dir_path
+        if gitolite_lib_dir.starts_with?('/')
+          gitolite_lib_dir
+        else
+          File.join(gitolite_home_dir, gitolite_lib_dir)
+        end
+      end
+
+
       def gitolite_user
         RedmineGitHosting::Config.get_setting(:gitolite_user)
       end