diff -ur /usr/ports/security/letsencrypt.sh/Makefile letsencrypt.sh/Makefile --- /usr/ports/security/letsencrypt.sh/Makefile 2016-07-19 13:04:13.000000000 +0200 +++ letsencrypt.sh/Makefile 2016-09-08 14:08:08.380136891 +0200 @@ -1,7 +1,7 @@ # $FreeBSD: head/security/letsencrypt.sh/Makefile 418767 2016-07-19 11:04:13Z mat $ PORTNAME= letsencrypt.sh -PORTVERSION= 0.2.0 +PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v CATEGORIES= security @@ -33,9 +33,10 @@ 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 @@ 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 diff -ur /usr/ports/security/letsencrypt.sh/distinfo letsencrypt.sh/distinfo --- /usr/ports/security/letsencrypt.sh/distinfo 2016-05-23 20:45:24.000000000 +0200 +++ letsencrypt.sh/distinfo 2016-09-08 13:14:42.337356640 +0200 @@ -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 diff -ur /usr/ports/security/letsencrypt.sh/files/000.letsencrypt.sh.in letsencrypt.sh/files/000.letsencrypt.sh.in --- /usr/ports/security/letsencrypt.sh/files/000.letsencrypt.sh.in 2016-03-06 07:26:11.000000000 +0100 +++ letsencrypt.sh/files/000.letsencrypt.sh.in 2016-09-08 13:21:16.049327553 +0200 @@ -16,9 +16,9 @@ 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:" diff -ur /usr/ports/security/letsencrypt.sh/files/pkg-message.in letsencrypt.sh/files/pkg-message.in --- /usr/ports/security/letsencrypt.sh/files/pkg-message.in 2016-02-14 19:29:04.000000000 +0100 +++ letsencrypt.sh/files/pkg-message.in 2016-09-08 17:49:16.144222237 +0200 @@ -3,10 +3,6 @@ %%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 @@ 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" +