Thanks Marius, I've made those changes and tried a push.
I received this on my local terminal: $ git push warning: peer certificate won't be verified in this SSL session == Gitorious: ========================================================== fatal error ======================================================================== fatal: The remote end hung up unexpectedly And this appeared in the gitorious_auth.log FATAL -- : NoMethodError undefined method `body' for #<String:0x7ff3aa2643a0>: /var/www/gitorious/script/../lib/gitorious/ssh/client.rb:87:in `configuration' /var/www/gitorious/script/../lib/gitorious/ssh/client.rb:58:in `real_path' /var/www/gitorious/script/../lib/gitorious/ssh/client.rb:72:in `to_git_shell_argument' /var/www/gitorious/script/gitorious:63 I've restarted the poller and will try a merge request later on. Cheers, Shane On Wednesday, 25 May 2011 09:21:27 UTC+1, Marius Mårnes Mathiesen wrote: > > On Tue, May 24, 2011 at 6:25 PM, ShaneOG <[email protected]> wrote: > >> Yes, the host is still incorrect in the merge request email. > > > Ah, you should restart your poller process, that's what sends the email. > > >> >> The SSL cert is correct and registered with Apache with it's full chain >> (it's an AlphaSSL wildcard cert if that helps). >> > > Okay, I just did some experiments, and found that the way we call the web > app to query for configuration will not work with SSL connections. To make > this work you could add this method in lib/gitorious/ssh/client.rb: > > def fetch_via_http(url) > require "net/https" > host = GitoriousConfig['gitorious_client_host'] > port = GitoriousConfig["gitorious_client_port"] > http = Net::HTTP.new(host,port) > http.use_ssl = port.to_i == 443 ? true : false > response, data = http.get(url) > return data > end > > > And then replace inside the configuration method in the same class: > > resp = connection.get(query_url) > > with > > resp = fetch_via_http(query_url) > > Let me know if this works for you; in that case I'll add some tests for it > and commit it. > > Cheers, > - Marius > -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
