Version 2.0.3

[acme] / Acme.pm

diff --git a/Acme.pm b/Acme.pm
index 161fbc93ac2703893f2be92c85116898b8470adf..0ba3e5da756716ee0434bc7bd3a2b1f3fda6602f 100644 (file)
--- a/Acme.pm
+++ b/Acme.pm
@@ -66,7 +66,7 @@ use constant {
        CONFIG => '/etc/acme/config',
        PENDING => '/tmp/acme',
        THUMBPRINT => '/etc/acme/thumbprint',
-       TERM => 'https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf',
+       TERM => 'https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017-w-v1.3-notice.pdf',
        MAIL => 'webmaster',
 
        # Certificate info
@@ -97,7 +97,7 @@ use constant {
        ACME_PROD_DIR => 'https://acme-v02.api.letsencrypt.org/directory',
 
        # Version
-       VERSION => '2.0.0',
+       VERSION => '2.0.3',
 
        # Timeout
        TIMEOUT => 300
@@ -1059,16 +1059,19 @@ sub issue {
                # Set content
                $content = $res->content;
 
-               # Remove multi-line jump
-               $content =~ s/\n\n/\n/;
-
-               # Remove trailing line jump
-               chomp $content;
-
                # Write to file
                write_file($file, $content);
        }
 
+       # Remove first multi-line jump
+       $content =~ s/\n\n/\n/;
+
+       # Remove ISRG Root X1 certificate signed by DST Root CA X3 present after second multi-line jump
+       $content =~ s/\n\n.*//s;
+
+       # Remove trailing line jump
+       chomp $content;
+
        # Write to cert file
        write_file($self->{domain}{cert}, $content);