From owner-svn-ports-head@freebsd.org Sun Sep 9 22:48:32 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E095E10A132E; Sun, 9 Sep 2018 22:48:31 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9679E8498B; Sun, 9 Sep 2018 22:48:31 +0000 (UTC) (envelope-from woodsb02@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF2F1FF9A; Sun, 9 Sep 2018 22:48:31 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w89MmVw2094566; Sun, 9 Sep 2018 22:48:31 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w89MmUhq094563; Sun, 9 Sep 2018 22:48:30 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201809092248.w89MmUhq094563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sun, 9 Sep 2018 22:48:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479341 - in head/security/acme.sh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/security/acme.sh: . files X-SVN-Commit-Revision: 479341 X-SVN-Commit-Repository: ports 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.27 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: Sun, 09 Sep 2018 22:48:32 -0000 Author: woodsb02 Date: Sun Sep 9 22:48:30 2018 New Revision: 479341 URL: https://svnweb.freebsd.org/changeset/ports/479341 Log: security/acme.sh: Use .conf suffix for /usr/local/etc/newsyslog.conf.d/ Rename files intended for installation to /usr/local/etc/newsyslog.conf.d/ to end with a '.conf' suffix. Proposed changes to /etc/newsyslog.conf will only include files from the /usr/local/etc/newsyslog.conf.d/ directory which end with '.conf' and do not beginning with a '.' character. https://reviews.freebsd.org/D17086 Approved by: dvl (maintainer) Differential Revision: https://reviews.freebsd.org/D17092 Added: head/security/acme.sh/files/acme.sh.conf - copied unchanged from r479340, head/security/acme.sh/files/acme.sh Deleted: head/security/acme.sh/files/acme.sh Modified: head/security/acme.sh/Makefile head/security/acme.sh/files/pkg-message.in head/security/acme.sh/pkg-plist Modified: head/security/acme.sh/Makefile ============================================================================== --- head/security/acme.sh/Makefile Sun Sep 9 22:46:04 2018 (r479340) +++ head/security/acme.sh/Makefile Sun Sep 9 22:48:30 2018 (r479341) @@ -2,6 +2,7 @@ PORTNAME= acme.sh PORTVERSION= 2.7.9 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org @@ -42,7 +43,7 @@ do-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/deploy ${STAGEDIR}${EXAMPLESDIR}/dnsapi ( cd ${WRKSRC} && ${COPYTREE_BIN} deploy ${STAGEDIR}${EXAMPLESDIR} ) ( cd ${WRKSRC} && ${COPYTREE_BIN} dnsapi ${STAGEDIR}${EXAMPLESDIR} ) - ${INSTALL_DATA} ${FILESDIR}/acme.sh ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${FILESDIR}/acme.sh.conf ${STAGEDIR}${EXAMPLESDIR} do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Copied: head/security/acme.sh/files/acme.sh.conf (from r479340, head/security/acme.sh/files/acme.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/acme.sh/files/acme.sh.conf Sun Sep 9 22:48:30 2018 (r479341, copy of r479340, head/security/acme.sh/files/acme.sh) @@ -0,0 +1,6 @@ +# acme.sh configuration file for newsyslog.conf +# +# see newsyslog.conf(5) for details +# +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] +/var/log/acme.sh.log acme:acme 640 90 * @T00 B Modified: head/security/acme.sh/files/pkg-message.in ============================================================================== --- head/security/acme.sh/files/pkg-message.in Sun Sep 9 22:46:04 2018 (r479340) +++ head/security/acme.sh/files/pkg-message.in Sun Sep 9 22:48:30 2018 (r479341) @@ -13,7 +13,7 @@ In the %%EXAMPLESDIR%% directory, you can find the dns scripts which will be useful if you decide to use dns-01 challenges. Also included are the deploy scripts. -A newsyslog.conf sample file is provided at %%EXAMPLESDIR%%/acme.sh +A newsyslog.conf sample file is provided at %%EXAMPLESDIR%%/acme.sh.conf and you could create a symlink from that to %%PREFIX%%/etc/newsyslog.conf.d/ Your sample cronjob looks like this: Modified: head/security/acme.sh/pkg-plist ============================================================================== --- head/security/acme.sh/pkg-plist Sun Sep 9 22:46:04 2018 (r479340) +++ head/security/acme.sh/pkg-plist Sun Sep 9 22:48:30 2018 (r479341) @@ -1,5 +1,5 @@ sbin/acme.sh -%%EXAMPLESDIR%%/acme.sh +%%EXAMPLESDIR%%/acme.sh.conf %%EXAMPLESDIR%%/deploy/README.md %%EXAMPLESDIR%%/deploy/apache.sh %%EXAMPLESDIR%%/deploy/cpanel_uapi.sh