From db61f060be5bc00cc9a44df694bac4ee4b65d02d Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Thu, 23 Jun 2011 21:55:00 +0200 Subject: [PATCH] git-instaweb: Extract configuring web server into configure_httpd 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.sh | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/git-instaweb.sh b/git-instaweb.sh index 8bfa8a055..49bab7bc9 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -587,32 +587,36 @@ our \$projects_list = \$projectroot; EOF } +configure_httpd() { + case "$httpd" in + *lighttpd*) + lighttpd_conf + ;; + *apache2*|*httpd*) + apache2_conf + ;; + webrick) + webrick_conf + ;; + *mongoose*) + mongoose_conf + ;; + *plackup*) + plackup_conf + ;; + *) + echo "Unknown httpd specified: $httpd" + exit 1 + ;; + esac +} + gitweb_conf resolve_full_httpd mkdir -p "$fqgitdir/gitweb/$httpd_only" -case "$httpd" in -*lighttpd*) - lighttpd_conf - ;; -*apache2*|*httpd*) - apache2_conf - ;; -webrick) - webrick_conf - ;; -*mongoose*) - mongoose_conf - ;; -*plackup*) - plackup_conf - ;; -*) - echo "Unknown httpd specified: $httpd" - exit 1 - ;; -esac +configure_httpd start_httpd url=http://127.0.0.1:$port -- 2.30.2