Update for new gitolite/gitweb structure and config

[gitweb-conf.git] / gitweb.conf

diff --git a/gitweb.conf b/gitweb.conf
index 7721330159ed559987d39af838732a2808993837..d3f9407a83de9f72cbe838106db26e047fc9186f 100644 (file)
--- a/gitweb.conf
+++ b/gitweb.conf
@@ -1,39 +1,17 @@
-$subdir = "madduck/pub";
+$vhostdir = "madduck";
+$pubdir = "pub";
 $confroot = "/srv/git/gitweb/git.madduck.net";
-$projectroot = "/srv/git/repos/$subdir";
+$projectroot = "/srv/git/repositories/$vhostdir/$pubdir";
 $git_temp = "/tmp";
 $site_header = "$confroot/header.html";
 $site_footer = "$confroot/footer.html";
-$projects_list = $projectroot;
-$default_projects_order = "project";
-@git_base_url_list=("git://git.madduck.net/$subdir", "ssh://git@git.madduck.net/$subdir");
-$logo = '/git-logo.png';
-$favicon = '/git-favicon.png';
-push @stylesheets, '/gitweb.css';
+$export_ok = "git-daemon-export-ok";
+$strict_export = 1;
+$omit_owner = 1;
+@git_base_url_list=("git://git.madduck.net/$vhostdir/$pubdir", "ssh://git@git.madduck.net/$vhostdir/$pubdir", "madduck:$pubdir");
 push @stylesheets, '/local.css';
 $feature{'pathinfo'}{'default'} = [1];
 $feature{'forks'}{'default'} = [1];
 $prevent_xss = 1;
 
-my $gl_conf_compiled = "/srv/git/.gitolite/conf/gitolite.conf-compiled.pm";
-my $username = $cgi->remote_user;
-
-our %repos;
-die "parse $gl_conf_compiled failed: " . ($! or $@) unless do $gl_conf_compiled;
-
-$export_auth_hook = sub {
-#    open FILE, ">>/tmp/gitweb.auth" or die $!;
-
-    my $reponame = "$subdir/" . shift;
-    # gitweb passes us the full repo path; so we strip the beginning...
-    $reponame =~ s/\Q$projectroot\E\/?//;
-    # ...and the end, to get the repo name as it is specified in gitolite conf
-    $reponame =~ s/\.git$//;
-
-#    use Data::Dumper;
-#    print FILE Dumper($username, $reponame, $repos);
-#    close FILE;
-
-    return exists $repos{$reponame}{R}{$username}
-        || exists $repos{$reponame}{R}{'@all'};
-};
+#$export_auth_hook = sub { return -e "$_[0]/git-daemon-export-ok"; };