diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-10-29 21:05:57 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-10-29 21:06:28 +0300 |
| commit | 447585d2b515124301b2ea0ba8de4c36ee7e87fe (patch) | |
| tree | 54530415b5ae4c9147bf3084cd87759b9aabd11a | |
| parent | 6b1578d8628a87420144e25b03909ae891353541 (diff) | |
letsencrypt: remove workaround. fixed upstreamv0.31.25
| -rw-r--r-- | changelog.md | 4 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/letsencrypt.sh | 4 | ||||
| -rwxr-xr-x | update.sh | 10 |
3 files changed, 3 insertions, 15 deletions
diff --git a/changelog.md b/changelog.md index 46c5dab0..ce028034 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v0.31.24](https://github.com/nextcloud/nextcloudpi/commit/95a7165) (2017-10-27) nc-forward-ports: more info in output +[v0.31.25](https://github.com/nextcloud/nextcloudpi/commit/6ab01cd) (2017-10-29) letsencrypt: remove workaround. fixed upstream + +[v0.31.24](https://github.com/nextcloud/nextcloudpi/commit/53943b4) (2017-10-27) nc-forward-ports: more info in output [v0.31.23](https://github.com/nextcloud/nextcloudpi/commit/defba33) (2017-10-27) nc-format-USB: more info in output diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh index 53ead2da..8ab898ed 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/nextcloudpi-config.d/letsencrypt.sh @@ -39,10 +39,6 @@ install() git clone https://github.com/letsencrypt/letsencrypt /etc/letsencrypt/letsencrypt-auto --help # do not actually run certbot, only install packages - # temporary workaround for bug https://github.com/certbot/certbot/issues/5138#issuecomment-333391771 - cat >> /etc/pip.conf <<<"extra-index-url=https://www.piwheels.hostedpi.com/simple/zope.components" - /etc/letsencrypt/letsencrypt-auto --help # do not actually run certbot, only install packages - [[ "$DOCKERBUILD" == 1 ]] && { cat > /etc/cont-init.d/100-letsencrypt-run.sh <<EOF #!/bin/bash @@ -159,16 +159,6 @@ Listen 4443 </Directory> EOF - # temporary workaround for bug https://github.com/certbot/certbot/issues/5138#issuecomment-333391771 - cat > /etc/pip.conf <<EOF -[global] -extra-index-url=https://www.piwheels.hostedpi.com/simple -extra-index-url=https://www.piwheels.hostedpi.com/simple/zope.components -EOF - test -e /etc/pip.conf && grep -q zope /etc/pip.conf || { - /etc/letsencrypt/letsencrypt-auto --help - } - # tweak fail2ban email F=/etc/fail2ban/action.d/sendmail-common.conf sed -i 's|Fail2Ban|NextCloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf |