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 2016-06-11 14:43:57.919000000 -0400
+++ smeserver-git-1.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29GitRepositories 2016-06-11 14:49:06.000000000 -0400
@@ -293,15 +293,17 @@
$OUT .= " # Ensure all /git access is using HTTPS\n";
$OUT .= " \n";
+ $OUT .= " DirectorySlash On\n";
$OUT .= " SSLRequireSSL\n";
$OUT .= " \n";
$OUT .= "\n";
$OUT .= " # Ensure we can browse the repo with http://server.com/git/repo.git\n";
$OUT .= " # instead of http://server.com/git?p=repo.git;a=summary.\n";
- $OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n";
- $OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n";
- $OUT .= " RewriteRule ^$gitpath\/gitweb.cgi\(\.\*\\.git)\$ $gitpath/gitweb.cgi\$1 [PT]\n";
+ #$OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n";
+ #$OUT .= " RewriteCond %{REQUEST_FILENAME} !-d\n";
+ #$OUT .= " RewriteRule ^$gitpath\/gitweb.cgi\(\.\*\\.git)\$ $gitpath/gitweb.cgi\$1 [PT]\n";
+ $OUT .= " RewriteRule ^/git\$ /git/ [R]\n";
$OUT .= " RewriteCond %{REQUEST_URI} !=$gitpath/gitweb.*\n";
$OUT .= " RewriteCond %{REQUEST_FILENAME} !-f\n";
@@ -395,7 +397,7 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#~~~ PULL Access Setup
- $OUT .= " # PULL access to $gitpath/$git_repository.git\n";
+ $OUT .= " # PULL access to $gitpath/$git_repository.git\n";
if( $effective_pull_users ) {
$OUT .= " # PULL Access Control\n";
@@ -418,7 +420,7 @@
}
$OUT .= " Satisfy All\n";
- $OUT .= " # $gitpath/$git_repository.git\n\n";
+ $OUT .= " # $gitpath/$git_repository.git\n\n";
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#~~~ PUSH Access Setup - uses a virtual /push directory in the path that was