start work on implementing new mirror push strategy

Author: ericpaulbishop

app/controllers/repository_mirrors_controller.rb

@@ -25,7 +25,6 @@ def create
 			@mirror.project = @project
 
 			if @mirror.save
-				GitHosting.git_mirror_identity_file(@mirror)
 				respond_to do |format|
 					format.html {
 						redirect_to(
@@ -53,7 +52,6 @@ def edit
 	def update
 		respond_to do |format|
 			if @mirror.update_attributes(params[:repository_mirrors])
-				GitHosting.git_mirror_identity_file(@mirror)
 				format.html {
 					redirect_to(
 						url_for(
@@ -78,7 +76,6 @@ def destroy
 			# display confirmation view
 		else
 			if params[:confirm]
-				identify_file = GitHosting.git_mirror_identity_file(@mirror)
 				%x[#{git_user_runner} rm #{identify_file}]
 				redirect_url = url_for(
 					:controller => 'projects',
@@ -100,13 +97,13 @@ def settings
 	def push
 		respond_to do |format|
 			format.html {
-				@shellout = %x{ export GIT_MIRROR_IDENTITY_FILE=#{GitHosting.git_mirror_identity_file(@mirror)}; export GIT_SSH='#{GitHosting.git_exec_mirror}'; #{GitHosting.git_exec} --git-dir='#{GitHosting.repository_path(@project)}.git' push --mirror '#{@mirror.url}' 2>&1 }
-				@push_failed = ($?.to_i!=0) ? true : false
-				if @push_failed
-					ms = " #{@mirror.url} push error "
-					nr = (70-ms.length)/2
-					GitHosting.logger.debug "Failed:\n%{nrs} #{ms} %{nrs}\n#{@shellout}%{nre} #{ms} %{nre}\n" % {:nrs => ">"*nr, :nre => "<"*nr}
-				end
+				#@shellout = %x{ export GIT_MIRROR_IDENTITY_FILE=#{GitHosting.git_mirror_identity_file(@mirror)}; export GIT_SSH='#{GitHosting.git_exec_mirror}'; #{GitHosting.git_exec} --git-dir='#{GitHosting.repository_path(@project)}.git' push --mirror '#{@mirror.url}' 2>&1 }
+				#@push_failed = ($?.to_i!=0) ? true : false
+				#if @push_failed
+				#	ms = " #{@mirror.url} push error "
+				#	nr = (70-ms.length)/2
+				#	GitHosting.logger.debug "Failed:\n%{nrs} #{ms} %{nrs}\n#{@shellout}%{nre} #{ms} %{nre}\n" % {:nrs => ">"*nr, :nre => "<"*nr}
+				#end
 			}
 		end
 	end

app/views/repository_mirrors/_form.html.erb

@@ -3,11 +3,6 @@
 <div class="box">
 <!--[form:repository_mirrors]-->
 	<p><%= f.text_field :url, :required => true, :size => 65 %></p>
-	<p>
-		<%= f.text_area :private_key, :required => true, :rows => 10, :cols => 65 %><br/>
-		<label>&nbsp;</label>
-		<span style="color: red; font-weight: bold;"><%= l(:field_private_key_warning) %></span>
-	</p>
 	<p><%= f.check_box :active %></p>
 </div>
 <!--[eoform:repository_mirrors]-->

lib/git_hosting.rb

@@ -185,29 +185,6 @@ def self.git_exec_mirror
 		return git_exec_mirror_path()
 	end
 
-	def self.git_mirror_identity_file(mirror)
-		identity_file_path = File.join(get_mirror_identities_dir(), mirror.to_s)
-		if !File.exists?(identity_file_path)
-			if git_user == web_user
-				File.open(identity_file_path, "w") do |f|
-					f.puts "#{mirror.private_key}"
-				end
-				%x[chmod 0600 #{identity_file_path}]
-			else
-				file = Tempfile.new('')
-				begin
-					file.write(mirror.private_key)
-					file.close
-					%x[#{git_user_runner} 'sudo -nu #{web_user} cat #{file.path} | cat - >  #{identity_file_path}']
-					%x[#{git_user_runner} 'chmod 0600 #{identity_file_path}']
-				ensure
-					file.unlink
-				end
-			end
-		end
-		return identity_file_path
-	end
-
 	def self.update_git_exec
 		logger.info "Setting up #{get_tmp_dir()}"
 		gitolite_key=Setting.plugin_redmine_git_hosting['gitoliteAdminPrivateKey']
@@ -302,9 +279,6 @@ def self.update_git_exec
 			%x[#{git_user_runner} 'sudo -u #{web_user} chown #{web_user}:#{git_user} #{git_exec_mirror_path()}']
 		end
 
-		RepositoryMirror.find(:all, :order => 'active DESC, created_at ASC', :conditions => "active=1").each {|mirror|
-			git_mirror_identity_file(mirror)
-		}
 	end
 
 	def self.clone_or_pull_gitolite_admin