Several improvements for opensuse.

tbrehm

2009-03-06 e6d68c2eb0d0b4e28a627405678a693026e92482

 server/plugins-available/apache2_plugin.inc.php

@@ -446,7 +446,8 @@
      
      $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";
      $vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";
      $vhost_data["web_basedir"] = $web_config["website_basedir"];
      
      // Check if a SSL cert exists
      $ssl_dir = $data["new"]["document_root"]."/ssl";
@@ -472,13 +473,13 @@
      $rewrite_rules = array();
      if($data["new"]["redirect_type"] != '') {
         $rewrite_rules[] = array(   'rewrite_domain'    => $data["new"]["domain"],
                              'rewrite_type'       => $data["new"]["redirect_type"],
                              'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                              'rewrite_target'    => $data["new"]["redirect_path"]);
            
            switch($data["new"]["subdomain"]) {
            case 'www':
             $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$data["new"]["domain"],
                                  'rewrite_type'       => $data["new"]["redirect_type"],
                                  'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                                  'rewrite_target'    => $data["new"]["redirect_path"]);
                break;
            case '*':
@@ -517,12 +518,12 @@
            // Rewriting
            if($alias["redirect_type"] != '') {
               $rewrite_rules[] = array(   'rewrite_domain'    => $alias["domain"],
                                    'rewrite_type'       => $alias["redirect_type"],
                                    'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                    'rewrite_target'    => $alias["redirect_path"]);
                    switch($alias["subdomain"]) {
                    case 'www':
                     $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$alias["domain"],
                                          'rewrite_type'       => $alias["redirect_type"],
                                          'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                          'rewrite_target'    => $alias["redirect_path"]);
                        break;
                    case '*':
@@ -602,7 +603,7 @@
      {
         //$cgi_config = $app->getconf->get_server_config($conf["server_id"], 'cgi');

         $cgi_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";
         $cgi_config["cgi_starter_path"] = $web_config["website_basedir"]."/php-cgi-scripts/[system_user]/";
         $cgi_config["cgi_starter_script"] = "php-cgi-starter";
         $cgi_config["cgi_bin"] = "/usr/bin/php-cgi";

@@ -721,7 +722,7 @@
         if ($data["old"]["php"] == "cgi")
         {
            // TODO: fetch the date from the server-settings
            $web_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";
            $web_config["cgi_starter_path"] = $web_config["website_basedir"]."/php-cgi-scripts/[system_user]/";

            $cgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["cgi_starter_path"]);
            if (is_dir($cgi_starter_path))