From owner-svn-ports-head@freebsd.org Sat Aug 13 14:45:46 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72BCBBAB2D6; Sat, 13 Aug 2016 14:45:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25A6018FE; Sat, 13 Aug 2016 14:45:46 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7DEjjsC014604; Sat, 13 Aug 2016 14:45:45 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7DEjjRG014602; Sat, 13 Aug 2016 14:45:45 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201608131445.u7DEjjRG014602@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 13 Aug 2016 14:45:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420161 - head/security/letskencrypt/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2016 14:45:46 -0000 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