From 81dfc67e5d1180a6ae05120619fd0bc14f8f349e Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Mon, 7 Jul 2014 08:10:14 -0700 Subject: [PATCH] Config.pm: simplify displayed fetch and push URLs The http/https URls containing /r/ and the ssh URLs containing /srv/git/ continue to work, but show the simpler and kinder URLs instead so they are easier to use and remember. --- Girocco/Config.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Girocco/Config.pm b/Girocco/Config.pm index edaeb1b..f500246 100644 --- a/Girocco/Config.pm +++ b/Girocco/Config.pm @@ -306,7 +306,7 @@ our $htmlurl = "http://repo.or.cz/h"; # If mod_rewrite is enabled and the sample apache.conf configuration is used # (with paths suitably updated), the trailing "/r" is optional for Git clients # that send a User-Agent string containing "git/" (case insensitively). -our $httppullurl = "http://repo.or.cz/r"; +our $httppullurl = "http://repo.or.cz"; # HTTPS push URL of the repository collection (undef if N/A) # If this is defined, the openssl command must be available @@ -316,7 +316,7 @@ our $httppullurl = "http://repo.or.cz/r"; # If the sample apache.conf configuration is used (with paths suitably updated), # the trailing "/r" is optional for Git clients that send a User-Agent string # containing "git/" (case insensitively). -our $httpspushurl = "https://repo.or.cz/r"; +our $httpspushurl = "https://repo.or.cz"; # Git URL of the repository collection (undef if N/A) # (You need to set up git-daemon on your system, and Girocco will not @@ -327,7 +327,7 @@ our $gitpullurl = "git://repo.or.cz"; # Note that the "/$jailreporoot" portion is optional and will be automatically # added if appropriate when omitted by the client so this URL can typically # be made the same as $gitpullurl with git: replaced with ssh: -our $pushurl = "ssh://repo.or.cz/$jailreporoot"; +our $pushurl = "ssh://repo.or.cz"; # URL of gitweb of this Girocco instance (set to undef if you're not nice # to the community) -- 2.11.4.GIT