==================================================================
  Please DO NOT REPLY to this mail or send email to the developers
  about this bug. Please follow-up to Bugzilla using this link:
    https://bugs.contribs.org/show_bug.cgi?id=9202

  Have you checked the Frequently Asked Questions (FAQ)?
    http://wiki.contribs.org/SME_Server:Documentation:FAQ

  Please also take the time to read the following useful guide:
    http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
==================================================================

--- Comment #18 from Unnilennium <[email protected]> ---
patch 2/2

/usr/bin/plague-client build smeserver-git smeserver-git-1_1_0-3_el6_sme
contribs9
Package smeserver-git enqueued.  Job ID: 1214.

%changelog
* Fri Jun 10 2016 Jean-Philipe Pialasse <[email protected]> 1.1.0-3.sme
- fix allow to see .git short url with gitweb [SME: 9202]


diff -Nur
smeserver-git-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
smeserver-git-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
---
smeserver-git-1.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
2015-02-04 00:59:41.000000000 -0500
+++
smeserver-git-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories
    2016-06-10 10:46:20.974000000 -0400
@@ -297,16 +297,22 @@
       $OUT .= "    </Location>\n";^M
       $OUT .= "\n";^M
 ^M
-      # $OUT .= "    # Ensure we can browse the repo with
http://server.com/git/repo.git\n";^M
-      # $OUT .= "    # instead of
http://server.com/git?p=repo.git;a=summary.\n";^M
-      # $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-f\n";^M
-      # $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-d\n";^M
-      # $OUT .= "    RewriteRule ^$gitpath\/gitweb.cgi\(\.\*\\.git)\$
$gitpath/gitweb.cgi\$1 [PT]\n";^M
+      $OUT .= "    # Ensure we can browse the repo with
http://server.com/git/repo.git\n";^M
+      $OUT .= "    # instead of
http://server.com/git?p=repo.git;a=summary.\n";^M
+      $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-f\n";^M
+      $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-d\n";^M
+      $OUT .= "    RewriteRule ^$gitpath\/gitweb.cgi\(\.\*\\.git)\$
$gitpath/gitweb.cgi\$1 [PT]\n";^M
+^M
+      $OUT .= "    RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n";^M
+      $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-f\n";^M
+      $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-d\n";^M
+      $OUT .= "    RewriteRule ^$gitpath(.*\\.git)?\$ $gitpath/gitweb.cgi\$1
[L,PT]\n\n";^M
+^M
+      $OUT .= "    RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n";^M
+      $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-f\n";^M
+      $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-d\n";^M
+      $OUT .= "    RewriteRule
^$gitpath(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?\$
$gitpath/gitweb.cgi%{REQUEST_URI} [L,PT]\n\n";^M
  ^M
-      # $OUT .= "    RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n";^M
-      # $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-f\n";^M
-      # $OUT .= "    RewriteCond %{REQUEST_FILENAME} !-d\n";^M
-      # $OUT .= "    RewriteRule
^/$git_subdir/(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?\$
$gitpath/gitweb/gitweb.cgi%{REQUEST_URI} [L,PT]\n\n";^M
 ^M
       if( $gitweb_theme eq 'enabled' ) {^M
         $OUT .= "    # config getprop git GitWebTheme == enabled\n";^M

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mail for each SME Contribs bug report
To unsubscribe, e-mail [email protected]
Searchable archive at https://lists.contribs.org/mailman/public/contribteam/

Reply via email to