Fixed: FS#2369 - Apache log files are in directory owned by web user

tbrehm

2012-08-14 d5a5172527f959b70e30299fa35cb63ca5801a68

 server/plugins-available/apache2_plugin.inc.php

@@ -451,7 +451,6 @@
         $app->system->chgrp($data['new']['document_root'].'/private',$groupname);
      }
      
      $app->system->web_folder_protection($data['new']['document_root'],true);
      
      // Remove the symlink for the site, if site is renamed
      if($this->action == 'update' && $data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain']) {
@@ -459,6 +458,7 @@
         if(is_link($data['old']['document_root'].'/log')) $app->system->unlink($data['old']['document_root'].'/log');
      }

      /*
      // Create the symlink for the logfiles
      if(!is_dir('/var/log/ispconfig/httpd/'.$data['new']['domain'])) $app->system->mkdirpath('/var/log/ispconfig/httpd/'.$data['new']['domain']);
      if(!is_link($data['new']['document_root'].'/log')) {
@@ -471,6 +471,22 @@

         $app->log('Creating symlink: ln -s /var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log',LOGLEVEL_DEBUG);
      }
      */
		
      //* Create the log dir if nescessary and mount it
      if(!is_dir($data['new']['document_root'].'/log') || is_link($data['new']['document_root'].'/log')) {
         if(is_link($data['new']['document_root'].'/log')) unlink($data['new']['document_root'].'/log');
         $app->system->mkdir($data['new']['document_root'].'/log');
         $app->system->chown($data['new']['document_root'].'/log','root');
         $app->system->chgrp($data['new']['document_root'].'/log','root');
         $app->system->chmod($data['new']['document_root'].'/log',0755);
         exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.$data['new']['domain']).' '.escapeshellarg($data['new']['document_root'].'/log'));
         //* add mountpoint to fstab
         $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/log    none    bind    0 0';
         $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1);
      }
		
      $app->system->web_folder_protection($data['new']['document_root'],true);

      // Get the client ID
      $client = $app->dbmaster->queryOneRecord('SELECT client_id FROM sys_group WHERE sys_group.groupid = '.intval($data['new']['sys_groupid']));