Added missing newline at the end of apache_ispconfig.conf.master

tbrehm

2009-10-18 ef6969eba7756cd971aefb2cbeec4e897a794e92

 server/plugins-available/apache2_plugin.inc.php

@@ -235,6 +235,14 @@
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
      
      //* Check if this is a chrooted setup
      if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
         $apache_chrooted = true;
         $app->log("Info: Apache is chrooted.",LOGLEVEL_DEBUG);
      } else {
         $apache_chrooted = false;
      }
		
      if($data["new"]["document_root"] == '') {
         $app->log("document_root not set",LOGLEVEL_WARN);
         return 0;
@@ -292,7 +300,7 @@
         $command .= ' '.escapeshellcmd($data["new"]["system_user"]);
         exec($command);
         
			
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
         
         
      }
@@ -438,12 +446,14 @@
      $groupname = escapeshellcmd($data["new"]["system_group"]);
      if($data["new"]["system_group"] != '' && !$app->system->is_group($data["new"]["system_group"])) {
         exec("groupadd $groupname");
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." groupadd $groupname");
         $app->log("Adding the group: $groupname",LOGLEVEL_DEBUG);
      }
      
      $username = escapeshellcmd($data["new"]["system_user"]);
      if($data["new"]["system_user"] != '' && !$app->system->is_user($data["new"]["system_user"])) {
         exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname -G sshusers $username -s /bin/false");
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." "."useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname -G sshusers $username -s /bin/false");
         $app->log("Adding the user: $username",LOGLEVEL_DEBUG);
      }
      
@@ -487,6 +497,18 @@
         $command .= ' '.escapeshellcmd($data["new"]["system_user"]);
         $this->_exec($command);
         
         //* if we have a chrooted apache enviroment
         if($apache_chrooted) {
            $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
				
            //* add the apache user to the client group in the chroot enviroment
            $tmp_groupfile = $app->system->server_conf["group_datei"];
            $app->system->server_conf["group_datei"] = $web_config['website_basedir'].'/etc/group';
            $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
            $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']));
         
@@ -515,6 +537,10 @@
         // make temp direcory writable for the apache user and the website user
         $this->_exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
      }
		
      // Change the owner of the error log to the owner of the website
      if(!@is_file($data["new"]["document_root"]."/log/error.log")) exec('touch '.escapeshellcmd($data["new"]["document_root"])."/log/error.log");
      $this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"])."/log/error.log");
      
      
      // Create the vhost config file
@@ -553,6 +579,10 @@
      $rewrite_rules = array();
      if($data["new"]["redirect_type"] != '') {
         if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/';
         if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') {
            $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/';
         }
			
         $rewrite_rules[] = array(   'rewrite_domain'    => $data["new"]["domain"],
                              'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                              'rewrite_target'    => $data["new"]["redirect_path"]);
@@ -600,6 +630,9 @@
            // Rewriting
            if($alias["redirect_type"] != '') {
               if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/';
               if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') {
                  $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/';
               }
               $rewrite_rules[] = array(   'rewrite_domain'    => $alias["domain"],
                                    'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                    'rewrite_target'    => $alias["redirect_path"]);
@@ -777,7 +810,7 @@
      //* Create .htaccess and .htpasswd file for website statistics
      if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess') or $data["old"]["document_root"] != $data["new"]["document_root"]) {
         if(!is_dir($data["new"]["document_root"].'/web/stats')) mkdir($data["new"]["document_root"].'/web/stats');
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data["new"]["document_root"]."/.htpasswd_stats\n<limit GET PUT POST>\nrequire valid-user\n</limit>";
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data["new"]["document_root"]."/.htpasswd_stats\nrequire valid-user";
         file_put_contents($data["new"]["document_root"].'/web/stats/.htaccess',$ht_file);
         chmod($data["new"]["document_root"].'/web/stats/.htaccess',0664);
         unset($ht_file);
@@ -793,9 +826,12 @@
      }
      
      
		
      // request a httpd reload when all records have been processed
      $app->services->restartServiceDelayed('httpd','reload');
      if($apache_chrooted) {
         $app->services->restartServiceDelayed('httpd','restart');
      } else {
         // request a httpd reload when all records have been processed
         $app->services->restartServiceDelayed('httpd','reload');
      }
      
      //* Unset action to clean it for next processed vhost.
      $this->action = '';
@@ -809,6 +845,12 @@
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
      
      //* Check if this is a chrooted setup
      if($web_config['website_basedir'] != '' && @is_file($web_config['/var/www'].'/etc/passwd')) {
         $apache_chrooted = true;
      } else {
         $apache_chrooted = false;
      }
      
      if($data["old"]["type"] != "vhost" && $data["old"]["parent_domain_id"] > 0) {
         //* This is a alias domain or subdomain, so we have to update the website instead
@@ -889,6 +931,8 @@
         $command = 'userdel';
         $command .= ' '.$data["old"]["system_user"];         
         exec($command);
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
			
      }
   }