Skip to content
Permalink
Browse files

Merge branch 'dev' into master

  • Loading branch information
cngarrison committed Nov 26, 2019
2 parents b23e05d + c282dd0 commit 84b0f29d87e89a568307b5c6298ee3d5ebb78e35
Showing with 4,340 additions and 427 deletions.
  1. +12 −0 .github/FUNDING.yml
  2. +4 −2 .github/ISSUE_TEMPLATE.md
  3. +4 −4 .github/PULL_REQUEST_TEMPLATE.md
  4. +3 −3 .travis.yml
  5. +5 −2 Dockerfile
  6. +674 −0 LICENSE.md
  7. +31 −1 README.md
  8. +303 −97 acme.sh
  9. +287 −0 deploy/docker.sh
  10. +5 −6 deploy/gcore_cdn.sh
  11. +1 −1 deploy/qiniu.sh
  12. +2 −2 deploy/vault_cli.sh
  13. +1 −1 dnsapi/dns_ali.sh
  14. +12 −2 dnsapi/dns_aws.sh
  15. +2 −2 dnsapi/dns_azure.sh
  16. +45 −42 dnsapi/dns_cf.sh
  17. +1 −1 dnsapi/dns_da.sh
  18. +4 −4 dnsapi/dns_desec.sh
  19. +3 −3 dnsapi/dns_doapi.sh
  20. +155 −0 dnsapi/dns_domeneshop.sh
  21. +1 −1 dnsapi/dns_dp.sh
  22. +5 −5 dnsapi/dns_durabledns.sh
  23. +1 −1 dnsapi/dns_euserv.sh
  24. +176 −131 dnsapi/dns_freedns.sh
  25. +2 −2 dnsapi/dns_gcloud.sh
  26. +8 −4 dnsapi/dns_he.sh
  27. +156 −0 dnsapi/dns_hexonet.sh
  28. +2 −14 dnsapi/dns_hostingde.sh
  29. +286 −0 dnsapi/dns_jd.sh
  30. +149 −0 dnsapi/dns_leaseweb.sh
  31. +2 −1 dnsapi/dns_linode_v4.sh
  32. +69 −0 dnsapi/dns_maradns.sh
  33. +1 −1 dnsapi/dns_me.sh
  34. +210 −0 dnsapi/dns_miab.sh
  35. +2 −0 dnsapi/dns_myapi.sh
  36. +4 −4 dnsapi/dns_namecheap.sh
  37. +9 −4 dnsapi/dns_namesilo.sh
  38. +1 −1 dnsapi/dns_netcup.sh
  39. +185 −0 dnsapi/dns_nic.sh
  40. +2 −2 dnsapi/dns_nsupdate.sh
  41. +99 −59 dnsapi/dns_one.sh
  42. +1 −1 dnsapi/dns_ovh.sh
  43. +414 −0 dnsapi/dns_pleskxml.sh
  44. +224 −0 dnsapi/dns_rcode0.sh
  45. +63 −0 dnsapi/dns_regru.sh
  46. +147 −0 dnsapi/dns_variomedia.sh
  47. +1 −1 dnsapi/dns_vscale.sh
  48. +161 −0 dnsapi/dns_vultr.sh
  49. +68 −0 notify/dingtalk.sh
  50. +86 −0 notify/ifttt.sh
  51. +33 −15 notify/mail.sh
  52. +1 −1 notify/mailgun.sh
  53. +58 −0 notify/postmark.sh
  54. +63 −0 notify/pushover.sh
  55. +6 −6 notify/sendgrid.sh
  56. +90 −0 notify/xmpp.sh
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: acmesh
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
@@ -1,9 +1,11 @@
<!--
请确保已经更新到最新的代码, 然后贴上来 `--debug 2` 的调试输出. 没有调试输出,我帮不了你.
我很忙, 每天可能只有 几秒钟 时间看你的 issue, 如果不按照我的要求写 issue, 你可能不会得到任何回复, 石沉大海.
请确保已经更新到最新的代码, 然后贴上来 `--debug 2` 的调试输出. 没有调试信息. 我做不了什么.
如何调试 https://github.com/Neilpang/acme.sh/wiki/How-to-debug-acme.sh
If it is a bug report:
- make sure you are able to repro it on the latest released version.
- make sure you are able to repro it on the latest released version.
You can install the latest version by: `acme.sh --upgrade`
- Search the existing issues.
@@ -1,9 +1,9 @@
<!--
Do NOT send pull request to `master` branch.
1. Do NOT send pull request to `master` branch.
Please send to `dev` branch instead.
Any PR to `master` branch will NOT be merged.
2. For dns api support, read this guide first: https://github.com/Neilpang/acme.sh/wiki/DNS-API-Dev-Guide
You will NOT get any review without passing this guide. You also need to fix the CI errors.
-->
@@ -28,11 +28,11 @@ script:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -V ; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -e SC2181 **/*.sh && echo "shellcheck OK" ; fi
- cd ..
- git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
- git clone --depth 1 https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
- if [ "$TRAVIS_OS_NAME" = "linux" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./rundocker.sh testplat ubuntu:latest ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ACME_OPENSSL_BIN="$ACME_OPENSSL_BIN" ./letest.sh ; fi

matrix:
fast_finish: true


@@ -1,13 +1,16 @@
FROM alpine:3.9
FROM alpine:3.10

RUN apk update -f \
&& apk --no-cache add -f \
openssl \
openssh-client \
coreutils \
bind-tools \
curl \
socat \
tzdata \
oath-toolkit-oathtool \
tar \
&& rm -rf /var/cache/apk/*

ENV LE_CONFIG_HOME /acme.sh
@@ -21,7 +24,7 @@ RUN cd /install_acme.sh && ([ -f /install_acme.sh/acme.sh ] && /install_acme.sh/

RUN ln -s /root/.acme.sh/acme.sh /usr/local/bin/acme.sh && crontab -l | grep acme.sh | sed 's#> /dev/null##' | crontab -

RUN for verb in help \
RUN for verb in help \
version \
install \
uninstall \

Large diffs are not rendered by default.

@@ -1,6 +1,6 @@
# An ACME Shell script: acme.sh [![Build Status](https://travis-ci.org/Neilpang/acme.sh.svg?branch=master)](https://travis-ci.org/Neilpang/acme.sh)

[![Join the chat at https://gitter.im/acme-sh/Lobby](https://badges.gitter.im/acme-sh/Lobby.svg)](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
<a href="https://opencollective.com/acmesh" alt="Financial Contributors on Open Collective"><img src="https://opencollective.com/acmesh/all/badge.svg?label=financial+contributors" /></a> [![Join the chat at https://gitter.im/acme-sh/Lobby](https://badges.gitter.im/acme-sh/Lobby.svg)](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
- An ACME protocol client written purely in Shell (Unix shell) language.
- Full ACME protocol implementation.
- Support ACME v1 and ACME v2
@@ -451,6 +451,36 @@ TODO:
2. ACME protocol: https://github.com/ietf-wg-acme/acme


## Contributors

### Code Contributors

This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
<a href="https://github.com/Neilpang/acme.sh/graphs/contributors"><img src="https://opencollective.com/acmesh/contributors.svg?width=890&button=false" /></a>

### Financial Contributors

Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/acmesh/contribute)]

#### Individuals

<a href="https://opencollective.com/acmesh"><img src="https://opencollective.com/acmesh/individuals.svg?width=890"></a>

#### Organizations

Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/acmesh/contribute)]

<a href="https://opencollective.com/acmesh/organization/0/website"><img src="https://opencollective.com/acmesh/organization/0/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/1/website"><img src="https://opencollective.com/acmesh/organization/1/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/2/website"><img src="https://opencollective.com/acmesh/organization/2/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/3/website"><img src="https://opencollective.com/acmesh/organization/3/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/4/website"><img src="https://opencollective.com/acmesh/organization/4/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/5/website"><img src="https://opencollective.com/acmesh/organization/5/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/6/website"><img src="https://opencollective.com/acmesh/organization/6/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/7/website"><img src="https://opencollective.com/acmesh/organization/7/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/8/website"><img src="https://opencollective.com/acmesh/organization/8/avatar.svg"></a>
<a href="https://opencollective.com/acmesh/organization/9/website"><img src="https://opencollective.com/acmesh/organization/9/avatar.svg"></a>

# 19. License & Others

License is GPLv3

0 comments on commit 84b0f29

Please sign in to comment.
You can’t perform that action at this time.