Date: Sat, 13 Aug 2016 14:45:45 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420161 - head/security/letskencrypt/files Message-ID: <201608131445.u7DEjjRG014602@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Aug 13 14:45:45 2016 New Revision: 420161 URL: https://svnweb.freebsd.org/changeset/ports/420161 Log: security/letskencrypt: Fix pkg-message - Remove unneeded license agreement warning from pkg-message - Fix broken example script while here PR: 211798 Modified: head/security/letskencrypt/files/letskencrypt.sh.sample.in head/security/letskencrypt/files/pkg-message.in Modified: head/security/letskencrypt/files/letskencrypt.sh.sample.in ============================================================================== --- head/security/letskencrypt/files/letskencrypt.sh.sample.in Sat Aug 13 12:30:40 2016 (r420160) +++ head/security/letskencrypt/files/letskencrypt.sh.sample.in Sat Aug 13 14:45:45 2016 (r420161) @@ -1,6 +1,4 @@ -#!/bin/sh - -set -e +#!/bin/sh -e BASEDIR="%%PREFIX%%/etc/letsencrypt" SSLDIR="%%PREFIX%%/etc/ssl/letsencrypt" @@ -12,8 +10,12 @@ CHALLENGEDIR="/usr/jails/http/usr/local/ cat "${DOMAINSFILE}" | while read domain line ; do CERTSDIR="${SSLDIR}/${domain}" [ ! -d "${CERTSDIR}" ] && mkdir -pm755 "${CERTSDIR}" + set +e # RC=2 when time to expire > 30 days letskencrypt -C "${CHALLENGEDIR}" \ -k "${SSLDIR}/private/${domain}.pem" \ -c "${CERTSDIR}" \ ${domain} ${line} + RC=$? + set -e + [ $RC -ne 0 -a $RC -ne 2 ] && exit $RC done Modified: head/security/letskencrypt/files/pkg-message.in ============================================================================== --- head/security/letskencrypt/files/pkg-message.in Sat Aug 13 12:30:40 2016 (r420160) +++ head/security/letskencrypt/files/pkg-message.in Sat Aug 13 14:45:45 2016 (r420161) @@ -1,15 +1,3 @@ - -============================================================== - -LetsEncrypt's ACME servers have changed the LE license -agreement. To successfully run renewal you have to add - - -a https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf - -to the command invocation. - -============================================================== - There are example scripts in %%PREFIX%%/etc/letsencrypt that you can for renewing and deploying multiple certificates
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608131445.u7DEjjRG014602>