From owner-svn-ports-head@freebsd.org Sat Oct 8 13:36:15 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 A5950C057CE; Sat, 8 Oct 2016 13:36:15 +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 5EB58A56; Sat, 8 Oct 2016 13:36:15 +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 u98DaED2087748; Sat, 8 Oct 2016 13:36:14 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98DaE3R087747; Sat, 8 Oct 2016 13:36:14 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201610081336.u98DaE3R087747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 8 Oct 2016 13:36:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423507 - head/security/acme-client/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.23 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, 08 Oct 2016 13:36:15 -0000 Author: brnrd Date: Sat Oct 8 13:36:14 2016 New Revision: 423507 URL: https://svnweb.freebsd.org/changeset/ports/423507 Log: security/acme-client: Fixes for periodic script - Fix domains and client-args variable typos [1] - Don't display deploy messages when deploy-script unset[2] PR: 213162 [1], 213163 [2] Submitted by: peterj Modified: head/security/acme-client/files/000.acme-client.sh.in Modified: head/security/acme-client/files/000.acme-client.sh.in ============================================================================== --- head/security/acme-client/files/000.acme-client.sh.in Sat Oct 8 13:12:31 2016 (r423506) +++ head/security/acme-client/files/000.acme-client.sh.in Sat Oct 8 13:36:14 2016 (r423507) @@ -32,27 +32,27 @@ case "$weekly_acme_client_enable" in echo echo "Checking Let's Encrypt certificate status:" - : ${weekly_acme_client_args:="-b"} - if [ -x "$weekly_acme_client_renewscript" ] ; then $weekly_acme_client_renewscript else + : ${weekly_acme_client_args:="-b"} if [ -z "$weekly_acme_client_domains" ] ; then - weekly_acme-client_domains=$(hostname -f) + weekly_acme_client_domains=$(hostname -f) echo "Using hostname: $weekly_acme_client_domains" fi if [ -n "$weekly_acme_client_challengedir" ] ; then - weekly_acme-client_args="$weekly_acme_client_args -C $weekly_acme_client_challengedir" + weekly_acme_client_args="$weekly_acme_client_args -C $weekly_acme_client_challengedir" fi %%LOCALBASE%%/bin/acme-client $weekly_acme_client_args $weekly_acme_client_domains fi - echo "Deploying Let's Encrypt certificates:" - - if [ -x "$weekly_acme_client_deployscript" ] ; then - $weekly_acme_client_deployscript - else - echo 'Skipped, deploy script not set.' + if [ -n "$weekly_acme_client_deployscript" ] ; then + if [ -x "$weekly_acme_client_deployscript" ] ; then + echo "Deploying Let's Encrypt certificates:" + $weekly_acme_client_deployscript + else + echo 'Skipped, deploy script does not exist or is not executable' + fi fi ;; *)