update default log format to combined

lnmpkvemail · Mar 22, 2016 · 941a4c5 · 941a4c5
1 parent 260d86c
commit 941a4c5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/conf/httpd-vhosts-lamp.conf b/conf/httpd-vhosts-lamp.conf
@@ -26,7 +26,7 @@ ServerAdmin webmaster@example.com
 DocumentRoot "/home/wwwroot/default"
 ServerName www.lnmp.org
 ErrorLog "/home/wwwlogs/IP-error_log"
-CustomLog "/home/wwwlogs/IP-access_log" common
+CustomLog "/home/wwwlogs/IP-access_log" combined
 <Directory "/home/wwwroot/default">
     SetOutputFilter DEFLATE
     Options FollowSymLinks

diff --git a/conf/httpd-vhosts-lnmpa.conf b/conf/httpd-vhosts-lnmpa.conf
@@ -26,7 +26,7 @@ ServerAdmin webmaster@example.com
 DocumentRoot "/home/wwwroot/default"
 ServerName www.lnmp.org
 ErrorLog "/home/wwwlogs/IP-error_log"
-CustomLog "/home/wwwlogs/IP-access_log" common
+CustomLog "/home/wwwlogs/IP-access_log" combined
 <Directory "/home/wwwroot/default">
     SetOutputFilter DEFLATE
     Options FollowSymLinks

diff --git a/conf/lamp b/conf/lamp
@@ -173,9 +173,8 @@ Add_VHost()
         if [ "${al_name}" = "" ]; then
             al_name="${domain}"
         fi
-        al="access_log  /home/wwwlogs/${al_name}.log  access;"
 
-    echo "You access log filename: ${al_name}.log"
+    echo "You access log filename: /home/wwwlogs/${al_name}-access_log"
     fi
 
     ServerAdmin=""
@@ -231,7 +230,7 @@ php_admin_value open_basedir "${vhostdir}:/tmp/:/var/tmp/:/proc/"
 DocumentRoot "${vhostdir}"
 ServerName ${domain}
 ErrorLog "/home/wwwlogs/${al_name}-error_log"
-CustomLog "/home/wwwlogs/${al_name}-access_log" common
+CustomLog "/home/wwwlogs/${al_name}-access_log" combined
 <Directory "${vhostdir}">
     SetOutputFilter DEFLATE
     Options FollowSymLinks
@@ -244,8 +243,8 @@ CustomLog "/home/wwwlogs/${al_name}-access_log" common
 eof
 
     if [ "${access_log}" == 'n' ]; then
-        sed -i 's/ErrorLog/#ErrorLog/g' /usr/local/apache/conf/vhost/${domain}.conf
-        sed -i 's/CustomLog/#CustomLog/g' /usr/local/apache/conf/vhost/${domain}.conf
+        sed -i 's/^ErrorLog/#ErrorLog/g' /usr/local/apache/conf/vhost/${domain}.conf
+        sed -i 's/^CustomLog/#CustomLog/g' /usr/local/apache/conf/vhost/${domain}.conf
     fi
 
     if [ "${add_more_domainame}" == 'y' ]; then

diff --git a/conf/lnmp b/conf/lnmp
@@ -205,7 +205,7 @@ Add_VHost()
         if [ "${al_name}" = "" ]; then
             al_name="${domain}"
         fi
-        al="access_log  /home/wwwlogs/${al_name}.log  access;"
+        al="access_log  /home/wwwlogs/${al_name}.log;"
 
     echo "You access log filename: ${al_name}.log"
     fi

diff --git a/conf/lnmpa b/conf/lnmpa
@@ -178,7 +178,7 @@ Add_VHost()
         if [ "${al_name}" = "" ]; then
             al_name="${domain}"
         fi
-        al="access_log  /home/wwwlogs/${al_name}.log  access;"
+        al="access_log  /home/wwwlogs/${al_name}.log;"
 
     echo "You access log filename: ${al_name}.log"
     fi
@@ -270,7 +270,7 @@ php_admin_value open_basedir "${vhostdir}:/tmp/:/var/tmp/:/proc/"
 DocumentRoot "${vhostdir}"
 ServerName ${domain}
 ErrorLog "/home/wwwlogs/${al_name}-error_log"
-CustomLog "/home/wwwlogs/${al_name}-access_log" common
+CustomLog "/home/wwwlogs/${al_name}-access_log" combined
 <Directory "${vhostdir}">
     SetOutputFilter DEFLATE
     Options FollowSymLinks

diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -55,11 +55,7 @@ http
         ##If enable limit_conn_zone,add "limit_conn perip 10;" to server section.
 
         server_tokens off;
-        #log format
-        log_format  access  '$remote_addr - $remote_user [$time_local] "$request" '
-             '$status $body_bytes_sent "$http_referer" '
-             '"$http_user_agent" $http_x_forwarded_for';
-		access_log off;
+        access_log off;
 
 server
     {
@@ -93,7 +89,7 @@ server
             deny all;
         }
 
-        access_log  /home/wwwlogs/access.log  access;
+        access_log  /home/wwwlogs/access.log;
     }
 include vhost/*.conf;
 }

diff --git a/conf/nginx_a.conf b/conf/nginx_a.conf
@@ -55,11 +55,7 @@ http
         ##If enable limit_conn_zone,add "limit_conn perip 10;" to server section.
 
         server_tokens off;
-        #log format
-        log_format  access  '$remote_addr - $remote_user [$time_local] "$request" '
-             '$status $body_bytes_sent "$http_referer" '
-             '"$http_user_agent" $http_x_forwarded_for';
-		access_log off;
+        access_log off;
 
 server
     {
@@ -93,7 +89,7 @@ server
             deny all;
         }
 
-        access_log  /home/wwwlogs/access.log  access;
+        access_log  /home/wwwlogs/access.log;
     }
 include vhost/*.conf;
 }