From owner-svn-ports-all@freebsd.org Sat Sep 10 16:21:54 2016 Return-Path: Delivered-To: svn-ports-all@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 8FBB3BD461C; Sat, 10 Sep 2016 16:21:54 +0000 (UTC) (envelope-from riggs@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 654D7AFD; Sat, 10 Sep 2016 16:21:54 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AGLrZI012079; Sat, 10 Sep 2016 16:21:53 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AGLrq6012074; Sat, 10 Sep 2016 16:21:53 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201609101621.u8AGLrq6012074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 10 Sep 2016 16:21:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421708 - in head/security/letsencrypt.sh: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 16:21:54 -0000 Author: riggs Date: Sat Sep 10 16:21:53 2016 New Revision: 421708 URL: https://svnweb.freebsd.org/changeset/ports/421708 Log: Update to upstream version 0.3.0 Detailed maintainer log regarding breaking upstream changes: - The config filename has been changed from "config.sh" to "config" - The WELLKNOWN location has been changed upstream to "/var/www/letsencrypt" The port uses "%%PREFIX%%/www/letsencrypt" in accordance to hier(7). PR: 212485 Submitted by: sascha@root-login.org (maintainer) Modified: head/security/letsencrypt.sh/Makefile head/security/letsencrypt.sh/distinfo head/security/letsencrypt.sh/files/000.letsencrypt.sh.in head/security/letsencrypt.sh/files/pkg-message.in Modified: head/security/letsencrypt.sh/Makefile ============================================================================== --- head/security/letsencrypt.sh/Makefile Sat Sep 10 16:04:09 2016 (r421707) +++ head/security/letsencrypt.sh/Makefile Sat Sep 10 16:21:53 2016 (r421708) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= letsencrypt.sh -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v CATEGORIES= security @@ -33,9 +33,10 @@ ZSH_RUN_DEPENDS= zsh:shells/zsh PERIODIC_DIRS= etc/periodic/weekly PERIODIC_FILES= 000.letsencrypt.sh -PLIST_DIRS= %%ETCDIR%%/.acme-challenges +PLIST_DIRS= %%ETCDIR%%/.acme-challenges \ + www/letsencrypt PLIST_FILES= bin/letsencrypt.sh \ - %%ETCDIR%%/config.sh.example \ + %%ETCDIR%%/config.example \ %%ETCDIR%%/hook.sh.example \ %%ETCDIR%%/domains.txt.example \ ${PERIODIC_DIRS}/000.letsencrypt.sh @@ -44,28 +45,38 @@ PORTDOCS_PLIST_FILES= %%PORTDOCS%%%%DOCS SUB_FILES= 000.letsencrypt.sh pkg-message SUB_LIST= PORTNAME=${PORTNAME} PORTDOCS= README.md dns-verification.md domains_txt.md ecc.md hook_chain.md \ - import-from-official-client.md staging.md troubleshooting.md wellknown.md + import-from-official-client.md per-certificate-config.md staging.md \ + troubleshooting.md wellknown.md -SHEBANG_FILES= docs/examples/config.sh.example docs/examples/hook.sh.example letsencrypt.sh +SHEBANG_FILES= docs/examples/hook.sh letsencrypt.sh + +post-patch: +. for f in docs/examples/config letsencrypt.sh + ${REINPLACE_CMD} 's|/var/www/letsencrypt|${PREFIX}/www/letsencrypt|' \ + ${WRKSRC}/${f} +. endfor post-patch-ZSH-on: -. for p in docs/examples/config.sh.example docs/examples/hook.sh.example letsencrypt.sh +. for p in docs/examples/config docs/examples/hook.sh letsencrypt.sh ${REINPLACE_CMD} '1 s/bash/zsh/' ${WRKSRC}/${p} . endfor do-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/.acme-challenges ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS} - ${INSTALL_DATA} ${WRKSRC}/docs/examples/config.sh.example ${STAGEDIR}${ETCDIR}/config.sh.example - ${INSTALL_DATA} ${WRKSRC}/docs/examples/hook.sh.example ${STAGEDIR}${ETCDIR}/hook.sh.example - ${INSTALL_DATA} ${WRKSRC}/docs/examples/domains.txt.example ${STAGEDIR}${ETCDIR}/domains.txt.example + ${INSTALL_DATA} ${WRKSRC}/docs/examples/config ${STAGEDIR}${ETCDIR}/config.example + ${INSTALL_DATA} ${WRKSRC}/docs/examples/hook.sh ${STAGEDIR}${ETCDIR}/hook.sh.example + ${INSTALL_DATA} ${WRKSRC}/docs/examples/domains.txt ${STAGEDIR}${ETCDIR}/domains.txt.example ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} . for d in dns-verification domains_txt ecc hook_chain import-from-official-client \ - staging troubleshooting wellknown + per-certificate-config staging troubleshooting wellknown ${INSTALL_MAN} ${WRKSRC}/docs/${d}.md ${STAGEDIR}${DOCSDIR} . endfor +post-stage: + ${MKDIR} ${STAGEDIR}${PREFIX}/www/letsencrypt + .include Modified: head/security/letsencrypt.sh/distinfo ============================================================================== --- head/security/letsencrypt.sh/distinfo Sat Sep 10 16:04:09 2016 (r421707) +++ head/security/letsencrypt.sh/distinfo Sat Sep 10 16:21:53 2016 (r421708) @@ -1,3 +1,3 @@ -TIMESTAMP = 1463941305 -SHA256 (lukas2511-letsencrypt.sh-v0.2.0_GH0.tar.gz) = d6e25bbbfa14b87dea4999ecddfd441bbcdc1fd8b3160fa4c4a8ed412ee664e1 -SIZE (lukas2511-letsencrypt.sh-v0.2.0_GH0.tar.gz) = 19314 +TIMESTAMP = 1473333268 +SHA256 (lukas2511-letsencrypt.sh-v0.3.0_GH0.tar.gz) = c04ada782c93082e760c89122c9fdf68802c67c86a38b3fd5a83bb66dc0701d0 +SIZE (lukas2511-letsencrypt.sh-v0.3.0_GH0.tar.gz) = 21530 Modified: head/security/letsencrypt.sh/files/000.letsencrypt.sh.in ============================================================================== --- head/security/letsencrypt.sh/files/000.letsencrypt.sh.in Sat Sep 10 16:04:09 2016 (r421707) +++ head/security/letsencrypt.sh/files/000.letsencrypt.sh.in Sat Sep 10 16:21:53 2016 (r421708) @@ -16,9 +16,9 @@ case "$weekly_letsencrypt_enable" in if [ -z "$weekly_letsencrypt_user" ] then - %%PREFIX%%/bin/letsencrypt.sh -c + %%PREFIX%%/bin/letsencrypt.sh -c $weekly_letsencrypt_flags else - su -m "$weekly_letsencrypt_user" -c '%%PREFIX%%/bin/letsencrypt.sh -c' + su -m "$weekly_letsencrypt_user" -c "%%PREFIX%%/bin/letsencrypt.sh -c $daily_status_disks_df_flags" fi echo "Deploying Let's Encrypt certificates:" Modified: head/security/letsencrypt.sh/files/pkg-message.in ============================================================================== --- head/security/letsencrypt.sh/files/pkg-message.in Sat Sep 10 16:04:09 2016 (r421707) +++ head/security/letsencrypt.sh/files/pkg-message.in Sat Sep 10 16:21:53 2016 (r421708) @@ -3,10 +3,6 @@ To use this script you should copy the e %%PREFIX%%/etc/%%PORTNAME%%/ and at least add a domain and a contact mail address. -You should also copy the openssl.cnf.sample file in -%%PREFIX%%/openssl so you won't get warnings about -it missing. - In order to run the script regularly to update the certificates add this line to /etc/periodic.conf @@ -17,6 +13,10 @@ Additionally the following parameters ca To run the certification renenewal as a different user weekly_letsencrypt_user="_letsencrypt" + To run a script after the renewal (as root) weekly_letsencrypt_deployscript="%%PREFIX%%/etc/%%PORTNAME%%/deploy.sh" +Additional flags for the periodic run go into +weekly_letsencrypt_flags="-g" +