1 |
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 |
2 |
--- 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 |
3 |
+++ 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 |
4 |
@@ -304,16 +304,22 @@ |
5 |
$OUT .= " </Location>\n"; |
6 |
$OUT .= "\n"; |
7 |
|
8 |
- # $OUT .= " # Ensure we can browse the repo with http://server.com/git/repo.git\n"; |
9 |
- # $OUT .= " # instead of http://server.com/git?p=repo.git;a=summary.\n"; |
10 |
- # $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
11 |
- # $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
12 |
- # $OUT .= " RewriteRule ^$gitpath\/gitweb.cgi\(\.\*\\.git)\$ $gitpath/gitweb.cgi\$1 [PT]\n"; |
13 |
+ $OUT .= " # Ensure we can browse the repo with http://server.com/git/repo.git\n"; |
14 |
+ $OUT .= " # instead of http://server.com/git?p=repo.git;a=summary.\n"; |
15 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
16 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
17 |
+ $OUT .= " RewriteRule ^$gitpath\/gitweb.cgi\(\.\*\\.git)\$ $gitpath/gitweb.cgi\$1 [PT]\n"; |
18 |
+ |
19 |
+ $OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n"; |
20 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
21 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
22 |
+ $OUT .= " RewriteRule ^$gitpath(.*\\.git)?\$ $gitpath/gitweb.cgi\$1 [L,PT]\n\n"; |
23 |
+ |
24 |
+ #$OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n"; |
25 |
+ #$OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
26 |
+ #$OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
27 |
+ #$OUT .= " RewriteRule ^$gitpath(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?\$ $gitpath/gitweb.cgi%{REQUEST_URI} [L,PT]\n\n"; |
28 |
|
29 |
- # $OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n"; |
30 |
- # $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
31 |
- # $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
32 |
- # $OUT .= " RewriteRule ^/$git_subdir/(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?\$ $gitpath/gitweb/gitweb.cgi%{REQUEST_URI} [L,PT]\n\n"; |
33 |
|
34 |
if( $gitweb_theme eq 'enabled' ) { |
35 |
$OUT .= " # config getprop git GitWebTheme == enabled\n"; |