X-Git-Url: https://git.rapsys.eu/acme/blobdiff_plain/d448b16ba9d3e17968a5a2b883bc2766d312913f..refs/heads/master:/Acme.pm diff --git a/Acme.pm b/Acme.pm index 161fbc9..2360380 100644 --- 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.3-September-21-2022.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.4', # Timeout TIMEOUT => 300 @@ -1059,16 +1059,22 @@ 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); } + # 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 + #$content =~ s/\n\n.*//s; + + # Remove trailing line jump + chomp $content; + # Write to cert file write_file($self->{domain}{cert}, $content);