ftimme
2011-09-22 b6a10a566385272f372ccd2c7c5bf158673d9ea5
- Added support for daily nginx access logs.
4 files modified
1 files added
25 ■■■■■ changed files
install/dist/lib/fedora.lib.php 5 ●●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 5 ●●●●● patch | view | raw | blame | history
install/lib/installer_base.lib.php 5 ●●●●● patch | view | raw | blame | history
server/conf/nginx_vhost.conf.master 1 ●●●● patch | view | raw | blame | history
server/scripts/create_daily_nginx_access_logs.sh 9 ●●●●● patch | view | raw | blame | history
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";
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";
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";
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 ~ /\. {
server/scripts/create_daily_nginx_access_logs.sh
New file
@@ -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