Ticket #835: patch.3.txt

--- trunk/engine/setup/ispcp-setup.orig 2007-11-29 09:26:09.000000000 -0500
+++ trunk/engine/setup/ispcp-setup      2007-11-30 11:27:15.000000000 -0500
@@ -2466,18 +2466,29 @@
        }
 
        #
-       # update apache logrotate
+       # update apache logrotate (check for apache, apache2)
        #
 
-       if ($main::cfg{'AWSTATS_ACTIVE'} eq 'yes') {
-               if (-f "/etc/logrotate.d/apache") {
-                       # TODO: Fix, if awstats.pl allready added
-                       sys_command_rs("sed -i 's#postrotate#postrotate\n\t\$main::cfg{'AWSTATS_ROOT_DIR'}/awstats_updateall.pl now -awstatsprog=$main::cfg{'AWSTATS_ENGINE_DIR'}/awstats.pl#g' /etc/logrotate.d/apache");
-               }
-               elsif (-f "/etc/loglogrotate.d/apache2") {
-                       # TODO: Fix, if awstats.pl allready added
-                       sys_command_rs("sed -i 's#postrotate#postrotate\n\t\{AWSTATS_ROOT_DIR}/awstats_updateall.pl now -awstatsprog=$main::cfg{'AWSTATS_ENGINE_DIR'}/awstats.pl#g' /etc/logrotate.d/apache2");
+       my @apache_file = ("apache", "apache2");
+       my $apache_file;
+       foreach $apache_file (@apache_file) {
+               if (-f "/etc/logrotate.d/".$apache_file) {
+                       my $file = "/etc/logrotate.d/".$apache_file;
+                       # search for awstats_updateall.pl
+                       my $word = "awstats_updateall.pl";
+
+                       open(F, '<' ,$file);
+                       my @lines = <F>;
+                       close(F);
+
+                       my $nummatches = grep(/$word/, @lines);
+
+                       # add code if not exists
+                       if ($nummatches == 0) {
+                               sys_command_rs("sed -i 's#sharedscripts#sharedscripts\n\tprerotate\n\t\t$main::cfg{'AWSTATS_ROOT_DIR'}/awstats_updateall.pl now -awstatsprog=$main::cfg{'AWSTATS_ENGINE_DIR'}/awstats.pl &> /dev/null\n\tendscript#g' /etc/logrotate.d/$apache_file");
+                       }
                }
+       }
 
        #
        # manage some permission;