* add a marker where the user configuration starts/ends * replaced the two $projectroot = lines * add a comment to $projectlist * reorder the variables Signed-off-by: Matthias Lederhofer <matled@xxxxxxx> --- I tried to put the variables at top which will be edited most likely (cannot have sane default values). --- gitweb/gitweb.cgi | 58 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 23 deletions(-) diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index 9448b72..ca2ef70 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -18,44 +18,42 @@ use File::Find qw(); binmode STDOUT, ':utf8'; our $cgi = new CGI; -our $version = "267"; -our $my_url = $cgi->url(); -our $my_uri = $cgi->url(-absolute => 1); -our $rss_link = ""; -# core git executable to use -# this can just be "git" if your webserver has a sensible PATH -our $GIT = "/usr/bin/git"; +## +## BEGIN USER CONFIGURATION +## # absolute fs-path which will be prepended to the project path -#our $projectroot = "/pub/scm"; -our $projectroot = "/home/kay/public_html/pub/scm"; +our $projectroot = "/pub/git"; -# version of the core git binary -our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown"; +# source of projects list +# file: list of projects, may use subdirectories +# directory: all git repositories in the directory (not subdirectories) +our $projects_list = "index/index.aux"; +#our $projects_list = $projectroot; -# location for temporary files needed for diffs -our $git_temp = "/tmp/gitweb"; -if (! -d $git_temp) { - mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp"); -} +# html text to include at home page +our $home_text = "indextext.html"; -# target of the home link on top of all pages -our $home_link = $my_uri; +# core git executable to use +# this can just be "git" if your webserver has a sensible PATH +our $GIT = "/usr/bin/git"; # name of your site or organization to appear in page titles # replace this with something more descriptive for clearer bookmarks our $site_name = $ENV{'SERVER_NAME'} || "Untitled"; -# html text to include at home page -our $home_text = "indextext.html"; +our $my_url = $cgi->url(); +our $my_uri = $cgi->url(-absolute => 1); +our $rss_link = ""; +# target of the home link on top of all pages +our $home_link = $my_uri; # URI of default stylesheet our $stylesheet = "gitweb.css"; -# source of projects list -#our $projects_list = $projectroot; -our $projects_list = "index/index.aux"; +# location for temporary files needed for diffs +our $git_temp = "/tmp/gitweb"; # default blob_plain mimetype and default charset for text/plain blob our $default_blob_plain_mimetype = 'text/plain'; @@ -65,6 +63,20 @@ # file to use for guessing MIME types be # (relative to the current git repository) our $mimetypes_file = undef; +## +## END USER CONFIGURATION +## + +# version of the core git binary +our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown"; + +our $version = "267"; + +# create temp directory +if (! -d $git_temp) { + mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp"); +} + # input validation and dispatch our $action = $cgi->param('a'); if (defined $action) { -- 1.4.2.rc2.g4713 - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html