- made state, locality, organization and organization unit optional on ssl ...

Marius Burkard

2016-02-04 2436971b3ebe3386fe9a3db44423a5705f9f6e38

 server/plugins-available/apache2_plugin.inc.php

@@ -275,10 +275,10 @@

        [ req_distinguished_name ]
        C                      = ".trim($data['new']['ssl_country'])."
        ST                     = ".trim($data['new']['ssl_state'])."
        L                      = ".trim($data['new']['ssl_locality'])."
        O                      = ".trim($data['new']['ssl_organisation'])."
        OU                     = ".trim($data['new']['ssl_organisation_unit'])."
        " . (trim($data['new']['ssl_state']) == '' ? '' : "ST                     = ".trim($data['new']['ssl_state'])) . "
        " . (trim($data['new']['ssl_locality']) == '' ? '' : "L                      = ".trim($data['new']['ssl_locality']))."
        " . (trim($data['new']['ssl_organisation']) == '' ? '' : "O                      = ".trim($data['new']['ssl_organisation']))."
        " . (trim($data['new']['ssl_organisation_unit']) == '' ? '' : "OU                     = ".trim($data['new']['ssl_organisation_unit']))."
        CN                     = $domain
        emailAddress           = webmaster@".$data['new']['domain']."

@@ -1166,8 +1166,6 @@
         $bundle_tmp_file = "/etc/letsencrypt/live/".$domain."/chain.pem";
         $webroot = $data['new']['document_root']."/web";

         $wk_dir_existed = false;
         if(is_dir($webroot . '/.well-known')) $wk_dir_existed = true;
         //* check if we have already a Let's Encrypt cert
         if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
            $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
@@ -1189,12 +1187,7 @@
            if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
               $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));
            }
         }
         if($wk_dir_existed == false && is_dir($webroot . '/.well-known')) {
            $this->_exec("rm -rf " . $webroot . "/.well-known");
         } elseif(is_dir($webroot . "/.well-known/acme-challenge/")) {
            $this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
         }
         };

         //* check is been correctly created
         if(file_exists($crt_tmp_file) OR file_exists($key_tmp_file)) {