Add last raw file

[acme] / Acme.pm

diff --git a/Acme.pm b/Acme.pm
index 0ba3e5da756716ee0434bc7bd3a2b1f3fda6602f..236038027c9274f8ff7b5cbede8f54bb9d7e9336 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',
        CONFIG => '/etc/acme/config',
        PENDING => '/tmp/acme',
        THUMBPRINT => '/etc/acme/thumbprint',

-       TERM => 'https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017-w-v1.3-notice.pdf',
+       TERM => 'https://letsencrypt.org/documents/LE-SA-v1.3-September-21-2022.pdf',

        MAIL => 'webmaster',
 
        # Certificate info
        MAIL => 'webmaster',
 
        # Certificate info


@@ -97,7 +97,7 @@ use constant {
        ACME_PROD_DIR => 'https://acme-v02.api.letsencrypt.org/directory',
 
        # Version
        ACME_PROD_DIR => 'https://acme-v02.api.letsencrypt.org/directory',
 
        # Version

-       VERSION => '2.0.3',
+       VERSION => '2.0.4',

 
        # Timeout
        TIMEOUT => 300
 
        # Timeout
        TIMEOUT => 300


@@ -1063,11 +1063,14 @@ sub issue {
                write_file($file, $content);
        }
 
                write_file($file, $content);
        }
 

-       # Remove first multi-line jump
-       $content =~ s/\n\n/\n/;
+       # Write to raw cert file
+       write_file($self->{domain}{cert}.'.raw', $content);
+
+       # Remove multi-line jump
+       $content =~ s/\n\n/\n/s;

 
        # Remove ISRG Root X1 certificate signed by DST Root CA X3 present after second multi-line jump
 
        # Remove ISRG Root X1 certificate signed by DST Root CA X3 present after second multi-line jump

-       $content =~ s/\n\n.*//s;
+       #$content =~ s/\n\n.*//s;

 
        # Remove trailing line jump
        chomp $content;
 
        # Remove trailing line jump
        chomp $content;