From: Mike Hommey <mh@glandium.org>
Date: Mon, 7 Jul 2008 20:22:15 +0000 (+0200)
Subject: Avoid apache complaining about lack of server's FQDN
X-Git-Tag: v1.6.0-rc0~104
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=603fb1168218a813f1b0816b1208c5d0c92cf29d;p=git.git

Avoid apache complaining about lack of server's FQDN

On some setups, apache will say:
apache2: Could not reliably determine the server's fully qualified
domain name, using $(IP_address) for ServerName

Avoid this message polluting tests output by setting a ServerName in
apache configuration.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index a4473462d..4717c2d33 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,3 +1,4 @@
+ServerName dummy
 PidFile httpd.pid
 DocumentRoot www
 ErrorLog error.log