From b6a10a566385272f372ccd2c7c5bf158673d9ea5 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 22 Sep 2011 11:59:36 -0400
Subject: [PATCH] - Added support for daily nginx access logs.

---
 server/conf/nginx_vhost.conf.master              |    1 +
 install/lib/installer_base.lib.php               |    5 +++++
 install/dist/lib/fedora.lib.php                  |    5 +++++
 install/dist/lib/opensuse.lib.php                |    5 +++++
 server/scripts/create_daily_nginx_access_logs.sh |    9 +++++++++
 5 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 30abfd2..5c774de 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1008,6 +1008,11 @@
 			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
 			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
 		);
+		
+		if ($conf['nginx']['installed'] == true) {
+			$root_cron_jobs[] = "0 0 * * * /usr/local/ispconfig/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
+		}
+		
 		foreach($root_cron_jobs as $cron_job) {
 			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
 				$existing_root_cron_jobs[] = $cron_job."\n";
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 45b33a5..2e43750 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1019,6 +1019,11 @@
 			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
 			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
 		);
+		
+		if ($conf['nginx']['installed'] == true) {
+			$root_cron_jobs[] = "0 0 * * * /usr/local/ispconfig/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
+		}
+		
 		foreach($root_cron_jobs as $cron_job) {
 			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
 				$existing_root_cron_jobs[] = $cron_job."\n";
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 70466dc..59c476f 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1919,6 +1919,11 @@
 				"* * * * * ".$install_dir."/server/server.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log",
 				"30 00 * * * ".$install_dir."/server/cron_daily.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log"
 		);
+		
+		if ($conf['nginx']['installed'] == true) {
+			$root_cron_jobs[] = "0 0 * * * ".$install_dir."/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
+		}
+		
 		foreach($root_cron_jobs as $cron_job) {
 			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
 				$existing_root_cron_jobs[] = $cron_job."\n";
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index df52349..a178e0e 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -46,6 +46,7 @@
         </tmpl_if>
 		
         error_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log;
+        access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined;
 
         ## Disable .htaccess and other hidden files
         location ~ /\. {
diff --git a/server/scripts/create_daily_nginx_access_logs.sh b/server/scripts/create_daily_nginx_access_logs.sh
new file mode 100644
index 0000000..44d7f6b
--- /dev/null
+++ b/server/scripts/create_daily_nginx_access_logs.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+FILES=/var/log/ispconfig/httpd/*
+for f in $FILES
+do
+  mv $f/access.log $f/`date "+%Y%m%d"`-access.log &> /dev/null
+  touch $f/access.log &> /dev/null
+done
+/etc/init.d/nginx reload  &> /dev/null
\ No newline at end of file

--
Gitblit v1.9.1