Attachment 174526 Details for Bug 212485 – v0.3.0 diff

[patch] v0.3.0 diff

le_030-2.diff (text/plain), 4.72 KB, created by Sascha Holzleiter on 2016-09-08 12:14:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Holzleiter

Created: 2016-09-08 12:14:10 UTC

Size: 4.72 KB

patch

obsolete

>diff -ur /usr/ports/security/letsencrypt.sh/Makefile letsencrypt.sh/Makefile
>--- /usr/ports/security/letsencrypt.sh/Makefile	2016-09-08 13:14:26.246357209 +0200
>+++ letsencrypt.sh/Makefile	2016-09-08 14:08:08.380136891 +0200
>@@ -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 <bsd.port.mk>
>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 13:25:48.764311873 +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,19 @@
> 
> 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"
>+
>+
>+WARNING: The config filename has been changed upstream from "config.sh"
>+         to "config". You'll have to rename your current config file!
>+         Also the default WELLKNOWN location has been changed to
>+         %%PREFIX%%/www/letsencrypt (upstream: /var/www/letsencrypt).
>+         To use the old location you'll have to modify your config
>+         file!
>+
>+

Flags:

sascha: maintainer-approval+

Actions: View | Diff

Attachments on bug 212485: 174526 | 174531 | 174532 | 174533