Skip to contentSkip to conversation

instaweb does not start because of a small syntax error in .git/gitweb/httpd.conf

PATCH In review Bodo Schlecht 3 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

When I start instaweb with

git instaweb

I get this error:

Syntax error on line 8 of /media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/gitweb/httpd.conf:
TypesConfig takes one argument, the MIME types config file
Could not execute http daemon apache2 -f.

Line 8 of /.git/gitweb/httpd.conf reads

TypesConfig /media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/mime.types

As you see, there is a space in the path so it should be quotes:

TypesConfig "/media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/mime.types"

In all other lines of http.conf the path is correctly in quotes:

ServerName "git-instaweb"
ServerRoot "/media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/gitweb" DocumentRoot "/media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/gitweb" PidFile "/media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/pid" Listen 127.0.0.1:4321
LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
TypesConfig /media/disk1part4/Eigene Dateien/superdigi/superdigientwicklung/.git/mime.types DirectoryIndex gitweb.cgi
LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
AddHandler cgi-script .cgi
<Location /gitweb.cgi>
Options +ExecCGI
</Location>

#1 lore raw

PATCH 1/1 Trivial path quoting fixes in git-instaweb

Bodo Schlecht noticed that Instaweb didn't propely quote all path instances in the Apache config file it generated.

---
 git-instaweb.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
git-instaweb.sh +2 -2
index 5f4419b..32f6496 100755
@@ -256,7 +256,7 @@ apache2_conf () {
 	mkdir -p "$GIT_DIR/gitweb/logs"
 	bind=
 	test x"$local" = xtrue && bind='127.0.0.1:'
-	echo 'text/css css' > $fqgitdir/mime.types
+	echo 'text/css css' > "$fqgitdir/mime.types"
 	cat > "$conf" <<EOF
 ServerName "git-instaweb"
 ServerRoot "$fqgitdir/gitweb"
@@ -272,7 +272,7 @@ EOF
 		fi
 	done
 	cat >> "$conf" <<EOF
-TypesConfig $fqgitdir/mime.types
+TypesConfig "$fqgitdir/mime.types"
 DirectoryIndex gitweb.cgi
 EOF
 
Signature · 1 line
1.6.3.3
Acked-by on v1 1/1
#2 lore raw

Re: [PATCH] Trivial path quoting fixes in git-instaweb

Quoted 3 lines · Sean Estabrooks

Bodo Schlecht noticed that Instaweb didn't propely quote all path instances in the Apache config file it generated.

Works for me here, thank you.

Quoted 27 lines
---
 git-instaweb.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
git-instaweb.sh +2 -2
index 5f4419b..32f6496 100755
@@ -256,7 +256,7 @@ apache2_conf () {
 	mkdir -p "$GIT_DIR/gitweb/logs"
 	bind=
 	test x"$local" = xtrue && bind='127.0.0.1:'
-	echo 'text/css css' > $fqgitdir/mime.types
+	echo 'text/css css' > "$fqgitdir/mime.types"
 	cat > "$conf" <<EOF
 ServerName "git-instaweb"
 ServerRoot "$fqgitdir/gitweb"
@@ -272,7 +272,7 @@ EOF
 		fi
 	done
 	cat >> "$conf" <<EOF
-TypesConfig $fqgitdir/mime.types
+TypesConfig "$fqgitdir/mime.types"
 DirectoryIndex gitweb.cgi
 EOF