Skip to content

Commit

Permalink
letsencrypt: remove workaround. fixed upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
nachoparker committed Oct 29, 2017
1 parent 6b1578d commit 447585d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
4 changes: 3 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 0 additions & 4 deletions etc/nextcloudpi-config.d/letsencrypt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 447585d

Please sign in to comment.