summaryrefslogtreecommitdiff
path: root/Documentation/git-instaweb.txt
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2011-06-23 23:01:03 +0200
committerEric Wong <normalperson@yhbt.net>2011-06-27 09:11:41 +0000
commit5ad6d387f19d9dd28b323f5cfea8663cb7b74617 (patch)
treed8833346f606870b6d319e9e34c0cd5b723f85ff /Documentation/git-instaweb.txt
parentc0175f92c7da1c379c25b5a70d53b9d550bcc11d (diff)
downloadgit-5ad6d387f19d9dd28b323f5cfea8663cb7b74617.tar.gz
git-instaweb: Check that correct config file exists for (re)start
Currently start/restart does not generate any configuration files for spawning a new instance. This means that $ git instaweb --http=<server> --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 <singh.gurjeet@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'Documentation/git-instaweb.txt')
-rw-r--r--Documentation/git-instaweb.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt
index 08f85ba046..ea95c90460 100644
--- a/Documentation/git-instaweb.txt
+++ b/Documentation/git-instaweb.txt
@@ -51,8 +51,8 @@ OPTIONS
start::
--start::
- Start the httpd instance and exit. This does not generate
- any of the configuration files for spawning a new instance.
+ Start the httpd instance and exit. Regenerate configuration files
+ as necessary for spawning a new instance.
stop::
--stop::
@@ -62,8 +62,8 @@ stop::
restart::
--restart::
- Restart the httpd instance and exit. This does not generate
- any of the configuration files for spawning a new instance.
+ Restart the httpd instance and exit. Regenerate configuration files
+ as necessary for spawning a new instance.
CONFIGURATION
-------------