use localhost as default ServerName, otherwise virtual hosts for the FQDN will match the default vhost

3 files changed, 2 insertions, 8 deletions

diff --git a/2.2/conf/vhosts.d/00_default_ssl_vhost.conf b/2.2/conf/vhosts.d/00_default_ssl_vhost.conf
index a95d3a6..2df0f0b 100644
--- a/2.2/conf/vhosts.d/00_default_ssl_vhost.conf
+++ b/2.2/conf/vhosts.d/00_default_ssl_vhost.conf
@@ -9,6 +9,7 @@
 Listen 443
 
 <VirtualHost _default_:443>
+	ServerName localhost
 	Include /etc/apache2/vhosts.d/default_vhost.include
 	ErrorLog /var/log/apache2/ssl_error_log
 
diff --git a/2.2/conf/vhosts.d/00_default_vhost.conf b/2.2/conf/vhosts.d/00_default_vhost.conf
index 73e45b8..9fa425a 100644
--- a/2.2/conf/vhosts.d/00_default_vhost.conf
+++ b/2.2/conf/vhosts.d/00_default_vhost.conf
@@ -36,6 +36,7 @@ NameVirtualHost *:80
 # /etc/conf.d/apache2, the first defined virtual host elsewhere will be
 # the default.
 <VirtualHost *:80>
+	ServerName localhost
 	Include /etc/apache2/vhosts.d/default_vhost.include
 
 	<IfModule mpm_peruser_module>
diff --git a/2.2/conf/vhosts.d/default_vhost.include b/2.2/conf/vhosts.d/default_vhost.include
index 4facc69..6d45888 100644
--- a/2.2/conf/vhosts.d/default_vhost.include
+++ b/2.2/conf/vhosts.d/default_vhost.include
@@ -3,14 +3,6 @@
 # as error documents.  e.g. admin@your-domain.com
 ServerAdmin root@localhost
 
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-#ServerName www.example.com:80
-
 # DocumentRoot: The directory out of which you will serve your
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.