Fixed a error in handling SSL

vogelor

2010-05-02 545abdd8f97e49c674682216a2a18c117d7e30ee

Fixed a error in handling SSL

 server/conf/vhost.conf.master

@@ -184,7 +184,7 @@
  </tmpl_if>
</tmpl_if>

    ServerName <tmpl_var name='domain'>
    ServerName <tmpl_var name='ssl_domain'>
<tmpl_if name='alias'>
    <tmpl_var name='alias'>
</tmpl_if>
@@ -203,10 +203,10 @@

</tmpl_if>
    SSLEngine on
    SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.crt
    SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.key
    SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt
    SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key
<tmpl_if name='has_bundle_cert'>
    SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.bundle
    SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
</tmpl_if>
    
    <Directory {tmpl_var name='web_document_root_www'}>

 server/plugins-available/apache2_plugin.inc.php

@@ -157,7 +157,7 @@
        //* Save a SSL certificate to disk
        if($data["new"]["ssl_action"] == 'save') {
            $ssl_dir = $data["new"]["document_root"]."/ssl";
            $domain = $data["new"]["domain"];
            $domain = $data["new"]["ssl_domain"];
              $csr_file = $ssl_dir.'/'.$domain.".csr";
              $crt_file = $ssl_dir.'/'.$domain.".crt";
            $bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -174,7 +174,7 @@
        //* Delete a SSL certificate
        if($data["new"]["ssl_action"] == 'del') {
            $ssl_dir = $data["new"]["document_root"]."/ssl";
            $domain = $data["new"]["domain"];
            $domain = $data["new"]["ssl_domain"];
              $csr_file = $ssl_dir.'/'.$domain.".csr";
              $crt_file = $ssl_dir.'/'.$domain.".crt";
            $bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -556,10 +556,11 @@
        $vhost_data["security_level"] = $web_config["security_level"];
        $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];
        $vhost_data["php_open_basedir"] = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];
        $vhost_data["ssl_domain"] = $data["new"]["ssl_domain"];
        
        // Check if a SSL cert exists
        $ssl_dir = $data["new"]["document_root"]."/ssl";
        $domain = $data["new"]["domain"];
        $domain = $data["new"]["ssl_domain"];
          $key_file = $ssl_dir.'/'.$domain.".key";
          $crt_file = $ssl_dir.'/'.$domain.".crt";
        $bundle_file = $ssl_dir.'/'.$domain.".bundle";