Bugfix: created php session directory is not writable by apache

tbrehm

2008-12-07 93f15ebee6f7e026893008ec6797ed360bc2b071

 server/plugins-available/apache2_plugin.inc.php

@@ -107,7 +107,7 @@
        O                      = ".$data['new']['ssl_organisation']."
        OU                     = ".$data['new']['ssl_organisation_unit']."
        CN                     = $domain
        emailAddress           = webmatser@".$data['new']['domain']."
        emailAddress           = webmaster@".$data['new']['domain']."

        [ req_attributes ]
        challengePassword              = A challenge password";
@@ -186,11 +186,24 @@
      if($this->action != 'insert') $this->action = 'update';
      
      if($data["new"]["type"] != "vhost" && $data["new"]["parent_domain_id"] > 0) {
			
         $old_parent_domain_id = intval($data["old"]["parent_domain_id"]);
         $new_parent_domain_id = intval($data["new"]["parent_domain_id"]);
			
         // If the parent_domain_id has been chenged, we will have to update the old site as well.
         if($data["new"]["parent_domain_id"] != $data["old"]["parent_domain_id"]) {
            $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$old_parent_domain_id." AND active = 'y'");
            $data["new"] = $tmp;
            $data["old"] = $tmp;
            $this->action = 'update';
            $this->update($event_name,$data);
         }
			
         // This is not a vhost, so we need to update the parent record instead.
         $parent_domain_id = intval($data["new"]["parent_domain_id"]);
         $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");
         $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$new_parent_domain_id." AND active = 'y'");
         $data["new"] = $tmp;
         $data["old"] = $tmp;
         $this->action = 'update';
      }
      
      
@@ -211,10 +224,11 @@
      
      // Check if the directories are there and create them if nescessary.
      if(!is_dir($data["new"]["document_root"]."/web")) exec("mkdir -p ".$data["new"]["document_root"]."/web");
      if(!is_dir($data["new"]["document_root"]."/web/error")) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
      if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
      //if(!is_dir($data["new"]["document_root"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
      if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
      if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
      if(!is_dir($data["new"]["document_root"]."/tmp")) exec("mkdir -p ".$data["new"]["document_root"]."/tmp");
      
      // Remove the symlink for the site, if site is renamed
      if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
@@ -286,10 +300,12 @@
      
      if($this->action == 'insert' && $data["new"]["type"] == 'vhost') {
         // Copy the error pages
         $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
         exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
         exec("chmod -R +r ".$error_page_path);
		
      if($data["new"]["errordocs"]){
           $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
           exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
           exec("chmod -R +r ".$error_page_path);
      }
      		
         // copy the standard index page
         exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
         exec("chmod +r ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
@@ -327,6 +343,9 @@
      // Chown and chmod the directories
      exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
      
      // make temp direcory writable for the apache user and the website user
      exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
		
      
      // Create the vhost config file
      $app->load('tpl');
@@ -336,6 +355,7 @@
      
      $vhost_data = $data["new"];
      $vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
      $vhost_data["web_document_root_www"] = "/var/www/".$data["new"]["domain"]."/web";
      
      // Check if a SSL cert exists
      $ssl_dir = $data["new"]["document_root"]."/ssl";
@@ -367,10 +387,14 @@
      
      // get alias domains (co-domains and subdomains)
      $aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND active = 'y'");
      $server_alias = '';
    if($data["new"]["is_subdomainwww"]){
       $server_alias .= 'www.'.$data["new"]["domain"].' ';
    } else {
        $server_alias = '';
    }
      if(is_array($aliases)) {
         foreach($aliases as $alias) {
            $server_alias .= $alias["domain"].' ';
           $server_alias .= $alias["domain"].' ';
            $app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
            // Rewriting
            if($alias["redirect_type"] != '') {