From: Eric Wong <normalperson@yhbt.net>
To: mike dalessio <mike@csa.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] instaweb: added support Ruby's WEBrick server
Date: Tue, 18 Sep 2007 13:40:33 -0700 [thread overview]
Message-ID: <20070918204012.GA28273@untitled> (raw)
In-Reply-To: <20070918121634.E8EFF814635@cyrano>
mike dalessio <mike@csa.net> wrote:
> running the webrick server with git requires Ruby and Ruby's YAML and
> Webrick libraries (both of which come standard with Ruby). nice for
> single-user standalone invocations.
>
> the --httpd=webrick option generates a ruby script on the fly to read
> httpd.conf options and invoke the web server via library call. this
> script is placed in the .git/gitweb directory. it also generates a
> shell script in a feeble attempt to invoke ruby in a portable manner,
> which assumes that 'ruby' is in the user's $PATH.
>
> Signed-off-by: Mike Dalessio <mike@csa.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
> ---
> Documentation/git-instaweb.txt | 3 +-
> git-instaweb.sh | 44 +++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 45 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
> index cec60ee..914fc4c 100644
> --- a/Documentation/git-instaweb.txt
> +++ b/Documentation/git-instaweb.txt
> @@ -27,7 +27,8 @@ OPTIONS
> The HTTP daemon command-line that will be executed.
> Command-line options may be specified here, and the
> configuration file will be added at the end of the command-line.
> - Currently, lighttpd and apache2 are the only supported servers.
> + Currently, lighttpd, apache2 and webrick are the only supported
> + servers.
> (Default: lighttpd)
>
> -m|--module-path::
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index b79c6b6..803a754 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -37,7 +37,9 @@ start_httpd () {
> else
> # many httpds are installed in /usr/sbin or /usr/local/sbin
> # these days and those are not in most users $PATHs
> - for i in /usr/local/sbin /usr/sbin
> + # in addition, we may have generated a server script
> + # in $fqgitdir/gitweb.
> + for i in /usr/local/sbin /usr/sbin $fqgitdir/gitweb
> do
> if test -x "$i/$httpd_only"
> then
> @@ -137,6 +139,43 @@ GIT_DIR="$fqgitdir"
> export GIT_EXEC_PATH GIT_DIR
>
>
> +webrick_conf () {
> + # generate a standalone server script in $fqgitdir/gitweb.
> + cat > "$fqgitdir/gitweb/$httpd.rb" <<EOF
> +require 'webrick'
> +require 'yaml'
> +options = YAML::load_file(ARGV[0])
> +options[:StartCallback] = proc do
> + File.open(options[:PidFile],"w") do |f|
> + f.puts Process.pid
> + end
> +end
> +options[:ServerType] = WEBrick::Daemon
> +server = WEBrick::HTTPServer.new(options)
> +['INT', 'TERM'].each do |signal|
> + trap(signal) {server.shutdown}
> +end
> +server.start
> +EOF
> + # generate a shell script to invoke the above ruby script,
> + # which assumes _ruby_ is in the user's $PATH. that's _one_
> + # portable way to run ruby, which could be installed anywhere,
> + # really.
> + cat > "$fqgitdir/gitweb/$httpd" <<EOF
> +#! /bin/sh
> +ruby $fqgitdir/gitweb/$httpd.rb \$*
> +EOF
> + chmod +x "$fqgitdir/gitweb/$httpd"
> +
> + cat > "$conf" <<EOF
> +:Port: $port
> +:DocumentRoot: "$fqgitdir/gitweb"
> +:DirectoryIndex: ["gitweb.cgi"]
> +:PidFile: "$fqgitdir/pid"
> +EOF
> + test "$local" = true && echo ':BindAddress: "127.0.0.1"' >> "$conf"
> +}
> +
> lighttpd_conf () {
> cat > "$conf" <<EOF
> server.document-root = "$fqgitdir/gitweb"
> @@ -237,6 +276,9 @@ case "$httpd" in
> *apache2*)
> apache2_conf
> ;;
> +webrick)
> + webrick_conf
> + ;;
> *)
> echo "Unknown httpd specified: $httpd"
> exit 1
> --
> 1.5.2.5
>
--
Eric Wong
next prev parent reply other threads:[~2007-09-18 20:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-18 12:16 [PATCH] instaweb: added support Ruby's WEBrick server mike dalessio
2007-09-18 20:40 ` Eric Wong [this message]
2007-09-18 23:15 ` Junio C Hamano
2007-09-19 0:41 ` David Symonds
2007-09-19 1:27 ` Johannes Schindelin
[not found] ` <55e906d58f15c79c61d83ad4c52ef085de8ad736.1191687881.git.mike@csa.net>
2007-10-06 17:29 ` [PATCH 1/2] instaweb: allow for use of auto-generated scripts mike
[not found] ` <cbdd8ea5ab52c45e87319335546ec7c2c06191cd.1191687881.git.mike@csa.net>
2007-10-06 17:29 ` [PATCH 2/2] instaweb: support for Ruby's WEBrick server mike
2007-10-14 9:49 ` [PATCH 1/2] instaweb: allow for use of auto-generated scripts Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070918204012.GA28273@untitled \
--to=normalperson@yhbt.net \
--cc=git@vger.kernel.org \
--cc=mike@csa.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).