git/git-instaweb.sh, branch v1.8.2.2

git-instaweb: Check that correct config file exists for (re)start

2011-06-27T09:11:41Z

Currently start/restart does not generate any configuration files for spawning a new instance. This means that $ git instaweb --http= --start might pick up stale 'httpd.conf' file for a different web server (e.g. for default lighttpd when requesting apache2). This commit changes that, and makes git-instaweb generate web server config file and/or gitweb config file if don't exists. This required naming config files after the name of web server (alternate solution would be to somehow mark for which web server was config file generated). Note that web servers that embed configuration in server script file, namely webrick and plackup, and which delete "$conf" in their *_conf function, would have their config (server script) always regenerated. Note: this commit introduces a bit of code repetition (but only a few lines). Reported-by: Gurjeet Singh Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Move all actions at the end of script

2011-06-27T09:11:41Z

As a nice side-effect now the order of parameters does not matter: $ git instaweb --httpd=apache2 --start is now (after this patch) the same as $ git instaweb --start --httpd=apache2 Before this commit --start, --stop, --restart (and their subcommand versions start, stop, restart) exited immediately. This is preparatory work for making start/restart check that correct configuration is set up; this change was required to have access in start_httpd to requested web browser etc. Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf

2011-06-27T09:11:41Z

Don't repeat yourself: use "$conf" instead of its [current] contents, namely "$fqgitdir/gitweb/httpd.conf". Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Extract configuring web server into configure_httpd

2011-06-27T09:11:41Z

This is preparatory work for making start/restart check that git-instaweb set up correct configuration, and generate it if it is missing. Pure refactoring, no functional changes. Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Change how gitweb.psgi is made runnable as standalone app

2011-02-28T06:02:31Z

According to blog post "FindBin, __FILE__, $0 and PSGI woes" http://bulknews.typepad.com/blog/2011/02/findbin-__file__-0-and-psgi-woes.html by Tatsuhiko Miyagawa, using 'if (__FILE__ eq $0)' in .psgi code (to check if script was run from command line), is not supposed to work since Plack 0.9971. Replace it with one of proposed solutions; while at it return $app explicitely, rather than implicitely by being a last expression. This affects 'plackup' web server. While at it cleanup whitespace. Signed-off-by: Jakub Narebski Acked-by: Eric Wong Signed-off-by: Junio C Hamano

git instaweb: enable remote_heads

2010-11-17T21:04:52Z

When using git instaweb to browse a local repository, performance is much less of an issue, and providing as much information as possible has a higher priority, so it makes sense to enable remote_heads. Signed-off-by: Giuseppe Bilotta Acked-by: Jakub Narebski Signed-off-by: Junio C Hamano

instaweb: add access+error logging for WEBrick

2010-08-05T08:51:26Z

This allows WEBrick to support all the logging functionality in a manner consistent with the other web servers. Signed-off-by: Eric Wong

instaweb: minimize moving parts for WEBrick

2010-08-05T08:51:26Z

Since there are WEBrick configuration settings (including the upcoming AccessLog support) that cannot be represented in YAML and require Ruby anyways, the YAML config file is an unnecessary layer of complexity. Additionally, the shell script wrapper to start WEBrick is unecessary since our generated Ruby script can be made executable in the same manner with /usr/bin/env. Signed-off-by: Eric Wong

instaweb: fix WEBrick server support

2010-08-05T08:51:26Z

This has been broken since commit be5347b ("httpd logs in a "$httpd_only" subdirectory"). Since WEBrick has no other way of preserving environment variables needed for gitweb, we create a shell script wrapper that sets the environment variables as our CGI interpreter to run gitweb.cgi. Signed-off-by: Eric Wong

git-instaweb: Don't assume Apache executable is named apache2

2010-07-23T18:16:05Z

On Arch Linux, the executable for the Apache HTTP server keeps the 'httpd' name and is not named 'apache2'. The path to the server modules also contains 'httpd' rather than 'apache2'. Remove some of these assumptions and add the httpd name in where it may be required. Finally, make some slight style adjustments to the code we are touching to make it fit the style of the rest of the script. Signed-off-by: Dan McGee Acked-by: Eric Wong