From 1ea8142d0e338b985b451c5301b06fd648cfebd7 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Sat, 29 Dec 2018 18:40:58 +0900
Subject: [PATCH] Update comments Fixed a default NameVirtualHost problem

Signed-off-by: Teddysun <i@teddysun.com>
---
 conf/lamp         | 2 +-
 include/apache.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/conf/lamp b/conf/lamp
index 9e4439b..dc5547e 100644
--- a/conf/lamp
+++ b/conf/lamp
@@ -373,7 +373,7 @@ vhost_list(){
     else
         echo "Apache virtual host not found. You can create a new Apache virtual host with command: lamp add"
     fi
-    ls ${apache_location}/conf/vhost/ | grep ".conf$" | grep -v "none" | sed 's/.conf//g'
+    ls ${apache_location}/conf/vhost/ | grep ".conf$" | grep -v "default" | sed 's/.conf//g'
 }
 
 vhost_del(){
diff --git a/include/apache.sh b/include/apache.sh
index fa067bd..bbea155 100644
--- a/include/apache.sh
+++ b/include/apache.sh
@@ -94,7 +94,6 @@ config_apache(){
 
     mv ${apache_location}/conf/extra/httpd-vhosts.conf ${apache_location}/conf/extra/httpd-vhosts.conf.bak
     mkdir -p ${apache_location}/conf/vhost/
-    touch ${apache_location}/conf/vhost/none.conf
 
     cat > /etc/logrotate.d/httpd <<EOF
 ${apache_location}/logs/access_log ${apache_location}/logs/error_log {
@@ -112,9 +111,11 @@ EOF
 
     cat > ${apache_location}/conf/extra/httpd-vhosts.conf <<EOF
 Include ${apache_location}/conf/vhost/*.conf
-<VirtualHost *:80>
+EOF
+
+    cat > ${apache_location}/conf/vhost/default.conf <<EOF
+<VirtualHost _default_:80>
 ServerName localhost
-ServerAlias localhost
 DocumentRoot ${web_root_dir}
 <Directory ${web_root_dir}>
     SetOutputFilter DEFLATE