Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 server/plugins-available/apache2_plugin.inc.php

@@ -189,7 +189,7 @@
      $app->uses('getconf');
      $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
      if ($web_config['CA_path']!='' && !file_exists($web_config['CA_path'].'/openssl.cnf'))
         $app->log("CA path error, file does not exist:".$web_config['CA_path'].'/openssl.conf',LOGLEVEL_ERROR);	
         $app->log("CA path error, file does not exist:".$web_config['CA_path'].'/openssl.cnf',LOGLEVEL_ERROR);	
      
      //* Only vhosts can have a ssl cert
      if($data["new"]["type"] != "vhost" && $data["new"]["type"] != "vhostsubdomain") return;
@@ -336,6 +336,7 @@
         //* Write the key file, if field is empty then import the key into the db
         if(trim($data["new"]["ssl_key"]) != '') {
            $app->system->file_put_contents($key_file2,$data["new"]["ssl_key"]);
            $app->system->chmod($key_file2,0400);
         } else {
            $ssl_key2 = $app->db->quote($app->system->file_get_contents($key_file2));
            /* Update the DB of the (local) Server */
@@ -762,6 +763,9 @@
            $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']).'/' . $web_folder);
         }
      }
		
      //* add the Apache user to the client group if this is a vhost and security level is set to high, no matter if this is an insert or update and regardless of set_folder_permissions_on_update
      if($data['new']['type'] == 'vhost' && $web_config['security_level'] == 20) $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));

      //* If the security level is set to high
      if(($this->action == 'insert' && $data['new']['type'] == 'vhost') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhost')) {
@@ -805,9 +809,6 @@
               $app->system->server_conf['group_datei'] = $tmp_groupfile;
               unset($tmp_groupfile);
            }

            //* add the Apache user to the client group
            $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
            
            //* Chown all default directories
            $app->system->chown($data['new']['document_root'],'root');
@@ -1121,7 +1122,7 @@
               
            // Rewriting
            if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
               if(substr($alias['redirect_path'],-1) != '/' && !preg_match('/^(https?|\[scheme\]):\/\//', $data['new']['redirect_path'])) $alias['redirect_path'] .= '/';
               if(substr($alias['redirect_path'],-1) != '/' && !preg_match('/^(https?|\[scheme\]):\/\//', $alias['redirect_path'])) $alias['redirect_path'] .= '/';
               if(substr($alias['redirect_path'],0,8) == '[scheme]'){
                  $rewrite_target = 'http'.substr($alias['redirect_path'],8);
                  $rewrite_target_ssl = 'https'.substr($alias['redirect_path'],8);
@@ -1352,9 +1353,9 @@

         if (!is_dir($cgi_starter_path)) {
            $app->system->mkdirpath($cgi_starter_path);
            $app->system->chmod($cgi_starter_script,0755);
            $app->system->chown($cgi_starter_script,$data['new']['system_user']);
            $app->system->chgrp($cgi_starter_script,$data['new']['system_group']);
            $app->system->chown($cgi_starter_path,$data['new']['system_user']);
            $app->system->chgrp($cgi_starter_path,$data['new']['system_group']);
            $app->system->chmod($cgi_starter_path,0755);

            $app->log('Creating cgi starter script directory: '.$cgi_starter_path,LOGLEVEL_DEBUG);
         }
@@ -1564,7 +1565,8 @@
         $apache_online_status_before_restart = $this->_checkTcp('localhost',80);
         $app->log('Apache status is: '.$apache_online_status_before_restart,LOGLEVEL_DEBUG);

         $app->services->restartService('httpd','restart');
         $retval = $app->services->restartService('httpd','restart'); // $retval['retval'] is 0 on success and > 0 on failure
         $app->log('Apache restart return value is: '.$retval['retval'],LOGLEVEL_DEBUG);
         
         // wait a few seconds, before we test the apache status again
         $apache_online_status_after_restart = false;
@@ -1576,8 +1578,41 @@
         }
         //* Check if apache restarted successfully if it was online before
         $app->log('Apache online status after restart is: '.$apache_online_status_after_restart,LOGLEVEL_DEBUG);
         if($apache_online_status_before_restart && !$apache_online_status_after_restart) {
            $app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].' Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
         if($apache_online_status_before_restart && !$apache_online_status_after_restart || $retval['retval'] > 0) {
            $app->log('Apache did not restart after the configuration change for website '.$data['new']['domain'].'. Reverting the configuration. Saved non-working config as '.$vhost_file.'.err',LOGLEVEL_WARN);
            if(is_array($retval['output']) && !empty($retval['output'])){
               $app->log('Reason for Apache restart failure: '.implode("\n", $retval['output']),LOGLEVEL_WARN);
            } else {
               // if no output is given, check again
               $webserver_binary = '';
               exec('which apache2', $webserver_check_output, $webserver_check_retval);
               if($webserver_check_retval == 0){
                  $webserver_binary = 'apache2';
               } else {
                  unset($webserver_check_output, $webserver_check_retval);
                  exec('which httpd2', $webserver_check_output, $webserver_check_retval);
                  if($webserver_check_retval == 0){
                     $webserver_binary = 'httpd2';
                  } else {
                     unset($webserver_check_output, $webserver_check_retval);
                     exec('which httpd', $webserver_check_output, $webserver_check_retval);
                     if($webserver_check_retval == 0){
                        $webserver_binary = 'httpd';
                     } else {
                        unset($webserver_check_output, $webserver_check_retval);
                        exec('which apache', $webserver_check_output, $webserver_check_retval);
                        if($webserver_check_retval == 0){
                           $webserver_binary = 'apache';
                        }
                     }
                  }
               }
               if($webserver_binary != ''){
                  exec($webserver_binary.' -t 2>&1', $tmp_output, $tmp_retval);
                  if($tmp_retval > 0 && is_array($tmp_output) && !empty($tmp_output)) $app->log('Reason for Apache restart failure: '.implode("\n", $tmp_output),LOGLEVEL_WARN);
                  unset($tmp_output, $tmp_retval);
               }
            }
            $app->system->copy($vhost_file,$vhost_file.'.err');
            if(is_file($vhost_file.'~')) {
               //* Copy back the last backup file
@@ -2855,8 +2890,10 @@
            $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
         }
         
         $this->_exec('groupdel client'.$client_id);
         $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
         if($app->system->is_group('client'.$client_id)){
            $this->_exec('groupdel client'.$client_id);
            $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
         }
      }
      
   }