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 |
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 |
--- 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 |
+++ 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 |
@@ -297,16 +297,22 @@ |
@@ -304,16 +304,22 @@ |
5 |
$OUT .= " </Location>\n"; |
$OUT .= " </Location>\n"; |
6 |
$OUT .= "\n"; |
$OUT .= "\n"; |
7 |
|
|
21 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
22 |
+ $OUT .= " RewriteRule ^$gitpath(.*\\.git)?\$ $gitpath/gitweb.cgi\$1 [L,PT]\n\n"; |
+ $OUT .= " RewriteRule ^$gitpath(.*\\.git)?\$ $gitpath/gitweb.cgi\$1 [L,PT]\n\n"; |
23 |
+ |
+ |
24 |
+ $OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n"; |
+ #$OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n"; |
25 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
+ #$OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
26 |
+ $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
+ #$OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n"; |
27 |
+ $OUT .= " RewriteRule ^$gitpath(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?\$ $gitpath/gitweb.cgi%{REQUEST_URI} [L,PT]\n\n"; |
+ #$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"; |
- # $OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n"; |
30 |
- # $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |
- # $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n"; |